Unverified Commit 72868479 authored by John Jones's avatar John Jones
Browse files

switch to multibuild provided alpine test images because... reasons?

parent 980d9b0e
...@@ -2,17 +2,6 @@ ...@@ -2,17 +2,6 @@
# Install and test steps on Linux # Install and test steps on Linux
set -e set -e
# shim for python:alpine not having bash
if [ -f "/etc/alpine-release" ]; then
apk update
apk add bash
fi
if [ -z "$BASH" ]; then
bash $0 $@
exit $?
fi
# "python" and "pip" are already on the path as part of the docker # "python" and "pip" are already on the path as part of the docker
# startup code in choose_python.sh, but the following are required and not # startup code in choose_python.sh, but the following are required and not
# necessarily already set # necessarily already set
......
...@@ -416,7 +416,7 @@ function build_suitesparse { ...@@ -416,7 +416,7 @@ function build_suitesparse {
if [ -n "$IS_MACOS" ]; then if [ -n "$IS_MACOS" ]; then
brew install suite-sparse > /dev/null brew install suite-sparse > /dev/null
elif [ -n "$IS_ALPINE" ]; then elif [ -n "$IS_ALPINE" ]; then
apk add suitesparse-dev apk add suitesparse-dev
elif [[ $MB_ML_VER == "_2_24" ]]; then elif [[ $MB_ML_VER == "_2_24" ]]; then
# debian:9 based distro # debian:9 based distro
apt-get install -y libsuitesparse-dev > /dev/null apt-get install -y libsuitesparse-dev > /dev/null
......
...@@ -45,7 +45,7 @@ function activate_ccache { ...@@ -45,7 +45,7 @@ function activate_ccache {
# Now install ccache # Now install ccache
local ccache_dir local ccache_dir
if [ -n "$IS_ALPINE" ]; then if [ -n "$IS_ALPINE" ]; then
supress apk add ccache supress apk add ccache
ccache_dir='/usr/lib/ccache/bin' ccache_dir='/usr/lib/ccache/bin'
else else
......
...@@ -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="python:$MB_PYTHON_VERSION-alpine" local docker_image="multibuild/alpine3.14_$plat"
else else
local bitness=$([ "$plat" == i686 ] && echo 32 || echo 64) local bitness=$([ "$plat" == i686 ] && echo 32 || echo 64)
local docker_image="matthewbrett/trusty:$bitness" local docker_image="matthewbrett/trusty:$bitness"
...@@ -140,6 +140,5 @@ function install_run { ...@@ -140,6 +140,5 @@ function install_run {
-e MANYLINUX_URL="$MANYLINUX_URL" \ -e MANYLINUX_URL="$MANYLINUX_URL" \
-e TEST_DEPENDS="$TEST_DEPENDS" \ -e TEST_DEPENDS="$TEST_DEPENDS" \
-v $PWD:/io \ -v $PWD:/io \
--entrypoint sh \
$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