From 66eef8a3db088168203ee354e633722259b94f9f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 9 Apr 2022 22:18:09 +1000 Subject: [PATCH 1/2] Test 64-bit manylinux on default focal --- .github/workflows/build.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index d88d24ba7..f5cf261d1 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -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" From 3ec765d2a4ed3eec37fcb6139072695cfb98c9ef Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sat, 9 Apr 2022 22:47:09 +1000 Subject: [PATCH 2/2] Install fribidi on manylinux --- config.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/config.sh b/config.sh index 56ae2876e..8dc5f63a2 100644 --- a/config.sh +++ b/config.sh @@ -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