Skip to content

GitLab

Unverified Commit aa6220ed authored by Matti Picus's avatar Matti Picus Committed by GitHub
Browse files

Merge pull request #465 from radarhere/alpine 

Updated to Alpine 3.15 test image
parents bce1637e 9d90c2a3
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
travis_linux_steps.sh
View file @ aa6220ed
...@@ -120,7 +120,7 @@ function install_run { ...@@ -120,7 +120,7 @@ function install_run {
local plat=${1:-${PLAT:-x86_64}} local plat=${1:-${PLAT:-x86_64}}
if [ -z "$DOCKER_TEST_IMAGE" ]; then if [ -z "$DOCKER_TEST_IMAGE" ]; then
if [ "$MB_ML_LIBC" == "musllinux" ]; then if [ "$MB_ML_LIBC" == "musllinux" ]; then
local docker_image="multibuild/alpine3.14_$plat" local docker_image="multibuild/alpine3.15_$plat"
else else
local bitness=$([ "$plat" == i686 ] && echo 32 || echo 64) local bitness=$([ "$plat" == i686 ] && echo 32 || echo 64)
if [ "$bitness" == "32" ]; then if [ "$bitness" == "32" ]; then
...@@ -142,6 +142,7 @@ function install_run { ...@@ -142,6 +142,7 @@ function install_run {
-e CONFIG_PATH="$CONFIG_PATH" \ -e CONFIG_PATH="$CONFIG_PATH" \
-e WHEEL_SDIR="$WHEEL_SDIR" \ -e WHEEL_SDIR="$WHEEL_SDIR" \
-e MANYLINUX_URL="$MANYLINUX_URL" \ -e MANYLINUX_URL="$MANYLINUX_URL" \
-e MB_ML_LIBC="$MB_ML_LIBC" \
-e TEST_DEPENDS="$TEST_DEPENDS" \ -e TEST_DEPENDS="$TEST_DEPENDS" \
-v $PWD:/io \ -v $PWD:/io \
$docker_image /io/$MULTIBUILD_DIR/docker_test_wrap.sh $docker_image /io/$MULTIBUILD_DIR/docker_test_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