From 35e0e57a38473f82c9a2944fb2ab44957efa4744 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Aug 2021 22:28:29 +1000 Subject: [PATCH 1/2] Test 64-bit Linux PyPy on focal --- .github/workflows/build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index d53d2781..d8922e78 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -8,7 +8,11 @@ fi if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then - DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT" + if [[ "$PLAT" == "i686" ]]; then + DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT" + else + DOCKER_TEST_IMAGE="multibuild/focal_$PLAT" + fi else MB_PYTHON_OSX_VER="10.9" fi From 510512e9eb03a8363d6e6ad1630e0b4a0d1bb041 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 27 Aug 2021 22:30:36 +1000 Subject: [PATCH 2/2] Simplified code --- .github/workflows/build.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index d8922e78..d3ece68d 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -7,14 +7,11 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then fi if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then - if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then - if [[ "$PLAT" == "i686" ]]; then - DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT" - else - DOCKER_TEST_IMAGE="multibuild/focal_$PLAT" - fi + MB_PYTHON_OSX_VER="10.9" + if [[ "$PLAT" == "i686" ]]; then + DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT" else - MB_PYTHON_OSX_VER="10.9" + DOCKER_TEST_IMAGE="multibuild/focal_$PLAT" fi fi