Skip to content

GitLab

Unverified Commit 281e570b authored by xoviat's avatar xoviat Committed by GitHub
Browse files

Revert "Merge master to devel"

parent eca961cb
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
travis_linux_steps.sh
View file @ 281e570b
...@@ -72,12 +72,14 @@ function build_multilinux { ...@@ -72,12 +72,14 @@ function build_multilinux {
# MB_PYTHON_VERSION # MB_PYTHON_VERSION
# UNICODE_WIDTH (optional) # UNICODE_WIDTH (optional)
# BUILD_DEPENDS (optional) # BUILD_DEPENDS (optional)
# DOCKER_IMAGE (optional)
# MANYLINUX_URL (optional) # MANYLINUX_URL (optional)
# WHEEL_SDIR (optional) # WHEEL_SDIR (optional)
local plat=$1 local plat=$1
[ -z "$plat" ] && echo "plat not defined" && exit 1 [ -z "$plat" ] && echo "plat not defined" && exit 1
local build_cmds="$2" local build_cmds="$2"
local docker_image=quay.io/pypa/manylinux1_$plat local docker_image=${DOCKER_IMAGE:-quay.io/pypa/manylinux1_\$plat}
docker_image=$(eval echo "$docker_image")
retry docker pull $docker_image retry docker pull $docker_image
docker run --rm \ docker run --rm \
-e BUILD_COMMANDS="$build_cmds" \ -e BUILD_COMMANDS="$build_cmds" \
......
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