Merge pull request #286 from radarhere/test_focal

This commit is contained in:
Hugo van Kemenade 2022-04-09 21:19:04 +03:00 committed by GitHub
commit 7ad1f4a57f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions

View File

@ -19,8 +19,6 @@ if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
else
DOCKER_TEST_IMAGE="multibuild/focal_$PLAT"
fi
elif [[ "$MB_ML_LIBC" == "manylinux" ]] && [[ "$PLAT" == "x86_64" ]]; then
DOCKER_TEST_IMAGE="matthewbrett/trusty:64"
fi
echo "::group::Install a virtualenv"

View File

@ -147,12 +147,7 @@ function run_tests_in_repo {
EXP_CODECS="jpg jpg_2000 libtiff zlib"
EXP_MODULES="freetype2 littlecms2 pil tkinter webp"
if ([ -n "$IS_MACOS" ] || [[ "$MB_PYTHON_VERSION" != pypy3* ]]) && [[ "$MACHTYPE" != aarch64* ]]; then
EXP_FEATURES="fribidi harfbuzz libjpeg_turbo raqm transp_webp webp_anim webp_mux xcb"
else
# can't find FriBiDi
EXP_FEATURES="libjpeg_turbo transp_webp webp_anim webp_mux xcb"
fi
EXP_FEATURES="fribidi harfbuzz libjpeg_turbo raqm transp_webp webp_anim webp_mux xcb"
function run_tests {
if [ -n "$IS_MACOS" ]; then
@ -163,6 +158,8 @@ function run_tests {
ln -s /usr/local/lib/libfribidi.dylib libfribidi.dylib
elif [ -n "$IS_ALPINE" ]; then
apk add fribidi
else
apt-get install libfribidi0
fi
if [[ "$MB_PYTHON_VERSION" == pypy3.* || "$MB_PYTHON_VERSION" == 3.10 ]] && [[ $(uname -m) == "i686" ]]; then
python3 -m pip install numpy==1.21.4