From 6674ee6f5a5a2aa03dfb26c6534c2162ac15ce9f Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, 19 Apr 2022 07:21:32 +1000
Subject: [PATCH] multibuild now considers PLAT when selecting focal test
 images

---
 .github/workflows/build.sh | 2 --
 .travis.yml                | 1 -
 multibuild                 | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh
index 585fdf17a..79815def3 100755
--- a/.github/workflows/build.sh
+++ b/.github/workflows/build.sh
@@ -16,8 +16,6 @@ if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
   MB_PYTHON_OSX_VER="10.9"
   if [[ "$PLAT" == "i686" ]]; then
     DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"
-  else
-    DOCKER_TEST_IMAGE="multibuild/focal_$PLAT"
   fi
 fi
 
diff --git a/.travis.yml b/.travis.yml
index 6dc81ecbe..98f9cb49f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ env:
       - REPO_DIR=Pillow
       - BUILD_COMMIT=HEAD
       - PLAT=aarch64
-      - DOCKER_TEST_IMAGE=multibuild/focal_{PLAT}
       - TEST_DEPENDS="pytest pytest-timeout"
 
 language: python
diff --git a/multibuild b/multibuild
index d0fdfdd42..a573af1e3 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit d0fdfdd42d1dfb82be1b7bddf185dd6a1c287bf8
+Subproject commit a573af1e3c701b3326a2b185719c0bd116ab44a4