Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
c7819d56
Unverified
Commit
c7819d56
authored
Jul 17, 2019
by
Matthew Brett
Committed by
GitHub
Jul 17, 2019
Browse files
Merge pull request #247 from radarhere/mb-python-version
Pass MB_PYTHON_VERSION to docker run in build_multilinux
parents
7c749492
182651cc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
0 deletions
+8
-0
tests/test_library_builders.sh
tests/test_library_builders.sh
+7
-0
travis_linux_steps.sh
travis_linux_steps.sh
+1
-0
No files found.
tests/test_library_builders.sh
View file @
c7819d56
...
@@ -4,6 +4,7 @@ export BUILD_PREFIX="${PWD}/builds"
...
@@ -4,6 +4,7 @@ export BUILD_PREFIX="${PWD}/builds"
rm_mkdir
$BUILD_PREFIX
rm_mkdir
$BUILD_PREFIX
source
configure_build.sh
source
configure_build.sh
source
library_builders.sh
source
library_builders.sh
source
tests/utils.sh
start_spinner
start_spinner
...
@@ -39,4 +40,10 @@ suppress build_ragel
...
@@ -39,4 +40,10 @@ suppress build_ragel
suppress build_cfitsio
suppress build_cfitsio
suppress build_new_zlib
suppress build_new_zlib
[
${
MB_PYTHON_VERSION
+x
}
]
||
ingest
"
\$
MB_PYTHON_VERSION is not set"
[
"
$MB_PYTHON_VERSION
"
==
"
$PYTHON_VERSION
"
]
||
ingest
"
\$
MB_PYTHON_VERSION must be equal to
\$
PYTHON_VERSION"
stop_spinner
stop_spinner
# Exit 1 if any test errors
barf
\ No newline at end of file
travis_linux_steps.sh
View file @
c7819d56
...
@@ -84,6 +84,7 @@ function build_multilinux {
...
@@ -84,6 +84,7 @@ function build_multilinux {
docker run
--rm
\
docker run
--rm
\
-e
BUILD_COMMANDS
=
"
$build_cmds
"
\
-e
BUILD_COMMANDS
=
"
$build_cmds
"
\
-e
PYTHON_VERSION
=
"
$MB_PYTHON_VERSION
"
\
-e
PYTHON_VERSION
=
"
$MB_PYTHON_VERSION
"
\
-e
MB_PYTHON_VERSION
=
"
$MB_PYTHON_VERSION
"
\
-e
UNICODE_WIDTH
=
"
$UNICODE_WIDTH
"
\
-e
UNICODE_WIDTH
=
"
$UNICODE_WIDTH
"
\
-e
BUILD_COMMIT
=
"
$BUILD_COMMIT
"
\
-e
BUILD_COMMIT
=
"
$BUILD_COMMIT
"
\
-e
CONFIG_PATH
=
"
$CONFIG_PATH
"
\
-e
CONFIG_PATH
=
"
$CONFIG_PATH
"
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment