Skip to content

GitLab

Unverified Commit 4cdd1927 authored by Matthew Brett's avatar Matthew Brett Committed by GitHub
Browse files

Merge pull request #251 from matthew-brett/default-plat 

Allow PLAT to be unset
parents 7287f694 77d16ccf
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
tests/test_multibuild.sh
View file @ 4cdd1927
...@@ -26,7 +26,8 @@ if [ -n "$TEST_BUILDS" ]; then ...@@ -26,7 +26,8 @@ if [ -n "$TEST_BUILDS" ]; then
else else
touch config.sh touch config.sh
source travis_linux_steps.sh source travis_linux_steps.sh
build_multilinux $PLAT "source tests/test_library_builders.sh" my_plat=${PLAT:-x86_64}
build_multilinux $my_plat "source tests/test_library_builders.sh"
fi fi
fi fi
......
travis_linux_steps.sh
View file @ 4cdd1927
...@@ -43,7 +43,7 @@ function build_wheel { ...@@ -43,7 +43,7 @@ function build_wheel {
# WHEEL_SDIR (optional) # WHEEL_SDIR (optional)
local repo_dir=${1:-$REPO_DIR} local repo_dir=${1:-$REPO_DIR}
[ -z "$repo_dir" ] && echo "repo_dir not defined" && exit 1 [ -z "$repo_dir" ] && echo "repo_dir not defined" && exit 1
local plat=${2:-$PLAT} local plat=${2:-${PLAT:-x86_64}}
build_multilinux $plat "build_wheel $repo_dir" build_multilinux $plat "build_wheel $repo_dir"
} }
...@@ -61,7 +61,7 @@ function build_index_wheel { ...@@ -61,7 +61,7 @@ function build_index_wheel {
# WHEEL_SDIR (optional) # WHEEL_SDIR (optional)
local project_spec=$1 local project_spec=$1
[ -z "$project_spec" ] && echo "project_spec not defined" && exit 1 [ -z "$project_spec" ] && echo "project_spec not defined" && exit 1
local plat=${2:-$PLAT} local plat=${2:-${PLAT:-x86_64}}
build_multilinux $plat "build_index_wheel $project_spec" build_multilinux $plat "build_index_wheel $project_spec"
} }
...@@ -112,7 +112,7 @@ function install_run { ...@@ -112,7 +112,7 @@ function install_run {
# WHEEL_SDIR (optional) # WHEEL_SDIR (optional)
# MANYLINUX_URL (optional) # MANYLINUX_URL (optional)
# TEST_DEPENDS (optional) # TEST_DEPENDS (optional)
local plat=${1:-$PLAT} local plat=${1:-${PLAT:-x86_64}}
bitness=$([ "$plat" == i686 ] && echo 32 || echo 64) bitness=$([ "$plat" == i686 ] && echo 32 || echo 64)
local docker_image="matthewbrett/trusty:$bitness" local docker_image="matthewbrett/trusty:$bitness"
docker pull $docker_image docker pull $docker_image
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment