"plugins/cpupme/vscode:/vscode.git/clone" did not exist on "3bbbeb8e558a5e5d01059e51cc1c9fac971c3323"
Commit 41c89a5e authored by Matthew Brett's avatar Matthew Brett
Browse files

Add manylinux tag variable

parent ed1cfaf3
...@@ -15,6 +15,12 @@ matrix: ...@@ -15,6 +15,12 @@ matrix:
dist: xenial dist: xenial
env: env:
- TEST_BUILDS=1 - TEST_BUILDS=1
# 64-bit builds, manylinux2014
- os: linux
dist: xenial
env:
- TEST_BUILDS=1
- MB_ML_VER=2010
# 32-bit builds # 32-bit builds
- os: linux - os: linux
dist: xenial dist: xenial
......
# Test some library builders # Test some library builders
# The environment
uname -a
ldd --version
# Smoke test # Smoke test
export BUILD_PREFIX="${PWD}/builds" export BUILD_PREFIX="${PWD}/builds"
rm_mkdir $BUILD_PREFIX rm_mkdir $BUILD_PREFIX
......
...@@ -13,6 +13,11 @@ set -e ...@@ -13,6 +13,11 @@ set -e
MANYLINUX_URL=${MANYLINUX_URL:-https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.ssl.cf2.rackcdn.com} MANYLINUX_URL=${MANYLINUX_URL:-https://5cf40426d9f06eb7461d-6fe47d9331aba7cd62fc36c7196769e4.ssl.cf2.rackcdn.com}
# Default Manylinux version
# Warning: ignored if DOCKER_IMAGE variable is set.
# See build_multilinux function.
MB_ML_VER=${MB_ML_VER:-1}
# Get our own location on this filesystem # Get our own location on this filesystem
MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}") MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
...@@ -70,6 +75,7 @@ function build_multilinux { ...@@ -70,6 +75,7 @@ function build_multilinux {
# #
# Depends on # Depends on
# MB_PYTHON_VERSION # MB_PYTHON_VERSION
# MB_ML_VER
# UNICODE_WIDTH (optional) # UNICODE_WIDTH (optional)
# BUILD_DEPENDS (optional) # BUILD_DEPENDS (optional)
# DOCKER_IMAGE (optional) # DOCKER_IMAGE (optional)
...@@ -78,7 +84,7 @@ function build_multilinux { ...@@ -78,7 +84,7 @@ function build_multilinux {
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=${DOCKER_IMAGE:-quay.io/pypa/manylinux1_\$plat} local docker_image=${DOCKER_IMAGE:-quay.io/pypa/manylinux${MB_ML_VER}_\$plat}
docker_image=$(eval echo "$docker_image") docker_image=$(eval echo "$docker_image")
retry docker pull $docker_image retry docker pull $docker_image
docker run --rm \ docker run --rm \
...@@ -95,6 +101,7 @@ function build_multilinux { ...@@ -95,6 +101,7 @@ function build_multilinux {
-e USE_CCACHE="$USE_CCACHE" \ -e USE_CCACHE="$USE_CCACHE" \
-e REPO_DIR="$repo_dir" \ -e REPO_DIR="$repo_dir" \
-e PLAT="$PLAT" \ -e PLAT="$PLAT" \
-e MB_ML_VER="$MB_ML_VER" \
-v $PWD:/io \ -v $PWD:/io \
-v $HOME:/parent-home \ -v $HOME:/parent-home \
$docker_image /io/$MULTIBUILD_DIR/docker_build_wrap.sh $docker_image /io/$MULTIBUILD_DIR/docker_build_wrap.sh
......
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