From 0364455bfb5d2785036ad5c08adacb30ca19b404 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Fri, 23 Oct 2020 14:23:03 +0100
Subject: [PATCH 1/8] move x86 jobs to GHA

---
 .github/workflows/wheels.yml |  77 ++++++++++++++++++++++++
 .travis.yml                  | 110 -----------------------------------
 2 files changed, 77 insertions(+), 110 deletions(-)
 create mode 100644 .github/workflows/wheels.yml

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
new file mode 100644
index 000000000..da95cb3b8
--- /dev/null
+++ b/.github/workflows/wheels.yml
@@ -0,0 +1,77 @@
+
+name: Wheels
+
+on: [push, pull_request, create]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ "ubuntu-16.04" ]
+        python: [ "3.6", "3.7", "3.8", "3.9", "pypy3.6-7.3" ]
+        platform: [ "x86_64", "i686" ]
+      fail-fast: false
+
+    timeout-minutes: 30
+    runs-on: ${{ matrix.os }}
+
+    name: ${{ matrix.python }} ${{ matrix.os }} ${{ matrix.platform }}
+
+    env:
+      REPO_DIR: Pillow
+      BUILD_COMMIT: HEAD
+      BUILD_DEPENDS: ""
+      TEST_DEPENDS: "pytest pytest-cov"
+      MACOSX_DEPLOYMENT_TARGET: 10.10
+      WHEEL_SDIR: wheelhouse
+      PLAT: ${{ matrix.platform }}
+      MB_PYTHON_VERSION: ${{ matrix.python }}
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      # Run everything in a single step because GHA doesn't share envvars
+      - name: Build Wheel
+        run: |
+          echo "::group::Install a virtualenv"
+            if [[ "${{ matrix.os }}" == "macos-latest" ]]; then
+              # pretend we are on Travis CI
+              TRAVIS_OS_NAME="osx"
+            fi
+            if [[ "${{ matrix.python }}" == "pypy3.6-7.3" ]]; then
+              # PyPy specific settings
+              if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then
+                MB_ML_VER="2010"
+                DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"
+              else
+                MB_PYTHON_OSX_VER="10.9"
+              fi
+            fi
+            source multibuild/common_utils.sh
+            source multibuild/travis_steps.sh
+            pip install virtualenv
+            before_install
+          echo "::endgroup::"
+
+          echo "::group::Build wheel"
+            if [[ "${{ startsWith(github.ref, 'refs/tags') }}" == "false" ]]; then
+              BUILD_COMMIT=master
+            fi
+            clean_code $REPO_DIR $BUILD_COMMIT
+            build_wheel $REPO_DIR $PLAT
+            ls -l "${GITHUB_WORKSPACE}/${WHEEL_SDIR}/"
+          echo "::endgroup::"
+
+          install_run $PLAT
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: wheels
+          path: wheelhouse/*.whl
diff --git a/.travis.yml b/.travis.yml
index 2ffa1b71a..f41027b62 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,17 +22,6 @@ jobs:
       language: generic
       env:
         - MB_PYTHON_VERSION=3.6
-
-    - name: "3.6 Xenial"
-      os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-    - name: "3.6 Xenial 32-bit"
-      os: linux
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - PLAT=i686
-
     - name: "3.7 macOS"
       os: osx
       osx_image: xcode9.3
@@ -51,35 +40,6 @@ jobs:
       language: generic
       env:
         - MB_PYTHON_VERSION=3.9
-
-    - name: "3.7 Xenial"
-      os: linux
-      env:
-        - MB_PYTHON_VERSION=3.7
-    - name: "3.7 Xenial 32-bit"
-      os: linux
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - PLAT=i686
-    - name: "3.8 Xenial"
-      os: linux
-      env:
-        - MB_PYTHON_VERSION=3.8
-    - name: "3.8 Xenial 32-bit"
-      os: linux
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - PLAT=i686
-    - name: "3.9 Xenial"
-      os: linux
-      env:
-        - MB_PYTHON_VERSION=3.9
-    - name: "3.9 Xenial 32-bit"
-      os: linux
-      env:
-        - MB_PYTHON_VERSION=3.9
-        - PLAT=i686
-
     - name: "3.6 macOS PyPy"
       os: osx
       osx_image: xcode9.3
@@ -87,12 +47,6 @@ jobs:
       env:
         - MB_PYTHON_VERSION=pypy3.6-7.3
         - MB_PYTHON_OSX_VER=10.9
-    - name: "3.6 Xenial 64-bit PyPy"
-      os: linux
-      env:
-        - MB_PYTHON_VERSION=pypy3.6-7.3
-        - MB_ML_VER=2010
-        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
 
     - name: "3.6 Xenial aarch64"
       arch: arm64
@@ -133,21 +87,6 @@ jobs:
       env:
         - MB_PYTHON_VERSION=3.6
         - LATEST="true"
-
-    - name: "3.6 Xenial latest"
-      os: linux
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - LATEST="true"
-    - name: "3.6 Xenial 32-bit latest"
-      os: linux
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - PLAT=i686
-        - LATEST="true"
-
     - name: "3.7 macOS latest"
       os: osx
       osx_image: xcode9.3
@@ -172,47 +111,6 @@ jobs:
       env:
         - MB_PYTHON_VERSION=3.9
         - LATEST="true"
-
-    - name: "3.7 Xenial latest"
-      os: linux
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - LATEST="true"
-    - name: "3.7 Xenial 32-bit latest"
-      os: linux
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - PLAT=i686
-        - LATEST="true"
-    - name: "3.8 Xenial latest"
-      os: linux
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - LATEST="true"
-    - name: "3.8 Xenial 32-bit latest"
-      os: linux
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - PLAT=i686
-        - LATEST="true"
-    - name: "3.9 Xenial latest"
-      os: linux
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.9
-        - LATEST="true"
-    - name: "3.9 Xenial 32-bit latest"
-      os: linux
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.9
-        - PLAT=i686
-        - LATEST="true"
-
     - name: "3.6 macOS PyPy latest"
       os: osx
       osx_image: xcode9.3
@@ -222,14 +120,6 @@ jobs:
         - MB_PYTHON_VERSION=pypy3.6-7.3
         - MB_PYTHON_OSX_VER=10.9
         - LATEST="true"
-    - name: "3.6 Xenial 64-bit PyPy latest"
-      os: linux
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=pypy3.6-7.3
-        - MB_ML_VER=2010
-        - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
-        - LATEST="true"
 
     - name: "3.6 Xenial aarch64 latest"
       os: linux

From 6991e05c68d3399190edf4ae1f344046882b47c1 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Fri, 23 Oct 2020 16:20:37 +0100
Subject: [PATCH 2/8] create release

---
 .github/workflows/wheels.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index da95cb3b8..daedcbce1 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -61,7 +61,7 @@ jobs:
           echo "::endgroup::"
 
           echo "::group::Build wheel"
-            if [[ "${{ startsWith(github.ref, 'refs/tags') }}" == "false" ]]; then
+            if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" == "false" ]]; then
               BUILD_COMMIT=master
             fi
             clean_code $REPO_DIR $BUILD_COMMIT
@@ -75,3 +75,18 @@ jobs:
         with:
           name: wheels
           path: wheelhouse/*.whl
+
+  release:
+    name: Create Release
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/')
+    needs: build
+    steps:
+      - uses: actions/download-artifact@v2
+        with:
+          name: wheels
+      - name: Upload Release
+        uses: fnkr/github-action-ghr@v1.3
+        env:
+          GHR_PATH: .
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From 6466660f7de9690bd66f9f394dcaf3bf7661f0d8 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Fri, 23 Oct 2020 15:16:09 +0100
Subject: [PATCH 3/8] move macOS to GHA

---
 .github/workflows/wheels.yml | 22 ++++++++---
 .travis.yml                  | 74 ------------------------------------
 config.sh                    | 14 +------
 3 files changed, 19 insertions(+), 91 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index daedcbce1..8b4421594 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -7,12 +7,14 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ "ubuntu-16.04" ]
+        os: [ "ubuntu-16.04", "macos-latest" ]
         python: [ "3.6", "3.7", "3.8", "3.9", "pypy3.6-7.3" ]
         platform: [ "x86_64", "i686" ]
+        exclude:
+          - os: "macos-latest"
+            platform: "i686"
       fail-fast: false
 
-    timeout-minutes: 30
     runs-on: ${{ matrix.os }}
 
     name: ${{ matrix.python }} ${{ matrix.os }} ${{ matrix.platform }}
@@ -22,7 +24,7 @@ jobs:
       BUILD_COMMIT: HEAD
       BUILD_DEPENDS: ""
       TEST_DEPENDS: "pytest pytest-cov"
-      MACOSX_DEPLOYMENT_TARGET: 10.10
+      MACOSX_DEPLOYMENT_TARGET: "10.10"
       WHEEL_SDIR: wheelhouse
       PLAT: ${{ matrix.platform }}
       MB_PYTHON_VERSION: ${{ matrix.python }}
@@ -37,13 +39,14 @@ jobs:
         with:
           python-version: 3.8
 
-      # Run everything in a single step because GHA doesn't share envvars
       - name: Build Wheel
         run: |
           echo "::group::Install a virtualenv"
             if [[ "${{ matrix.os }}" == "macos-latest" ]]; then
               # pretend we are on Travis CI
               TRAVIS_OS_NAME="osx"
+              # these cause a conflict with built webp and libtiff
+              brew remove --ignore-dependencies webp zstd xz libtiff
             fi
             if [[ "${{ matrix.python }}" == "pypy3.6-7.3" ]]; then
               # PyPy specific settings
@@ -56,6 +59,8 @@ jobs:
             fi
             source multibuild/common_utils.sh
             source multibuild/travis_steps.sh
+            # can't use default 7.3.1 on macOS due to https://foss.heptapod.net/pypy/pypy/-/issues/3229
+            LATEST_PP_7p3=7.3.2
             pip install virtualenv
             before_install
           echo "::endgroup::"
@@ -69,7 +74,14 @@ jobs:
             ls -l "${GITHUB_WORKSPACE}/${WHEEL_SDIR}/"
           echo "::endgroup::"
 
-          install_run $PLAT
+          echo "::group::Test wheel"
+            install_run $PLAT
+          echo "::endgroup::"
+
+#     Uncomment to get SSH access for testing
+#      - name: Setup tmate session
+#        if: failure()
+#        uses: mxschmitt/action-tmate@v3
 
       - uses: actions/upload-artifact@v2
         with:
diff --git a/.travis.yml b/.travis.yml
index f41027b62..2f876ac46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,38 +16,6 @@ services: docker
 
 jobs:
   include:
-    - name: "3.6 macOS"
-      os: osx
-      osx_image: xcode9.3
-      language: generic
-      env:
-        - MB_PYTHON_VERSION=3.6
-    - name: "3.7 macOS"
-      os: osx
-      osx_image: xcode9.3
-      language: generic
-      env:
-        - MB_PYTHON_VERSION=3.7
-    - name: "3.8 macOS"
-      os: osx
-      osx_image: xcode9.3
-      language: generic
-      env:
-        - MB_PYTHON_VERSION=3.8
-    - name: "3.9 macOS"
-      os: osx
-      osx_image: xcode9.3
-      language: generic
-      env:
-        - MB_PYTHON_VERSION=3.9
-    - name: "3.6 macOS PyPy"
-      os: osx
-      osx_image: xcode9.3
-      language: generic
-      env:
-        - MB_PYTHON_VERSION=pypy3.6-7.3
-        - MB_PYTHON_OSX_VER=10.9
-
     - name: "3.6 Xenial aarch64"
       arch: arm64
       env:
@@ -79,48 +47,6 @@ jobs:
         - MB_PYTHON_VERSION=3.9
         - DOCKER_TEST_IMAGE=multibuild/xenial_{PLAT}
 
-    - name: "3.6 macOS latest"
-      os: osx
-      osx_image: xcode9.3
-      language: generic
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.6
-        - LATEST="true"
-    - name: "3.7 macOS latest"
-      os: osx
-      osx_image: xcode9.3
-      language: generic
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.7
-        - LATEST="true"
-    - name: "3.8 macOS latest"
-      os: osx
-      osx_image: xcode9.3
-      language: generic
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.8
-        - LATEST="true"
-    - name: "3.9 macOS latest"
-      os: osx
-      osx_image: xcode9.3
-      language: generic
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=3.9
-        - LATEST="true"
-    - name: "3.6 macOS PyPy latest"
-      os: osx
-      osx_image: xcode9.3
-      language: generic
-      if: tag IS blank
-      env:
-        - MB_PYTHON_VERSION=pypy3.6-7.3
-        - MB_PYTHON_OSX_VER=10.9
-        - LATEST="true"
-
     - name: "3.6 Xenial aarch64 latest"
       os: linux
       arch: arm64
diff --git a/config.sh b/config.sh
index 31549b2d8..c5d6326aa 100644
--- a/config.sh
+++ b/config.sh
@@ -52,29 +52,19 @@ function pre_build {
     CFLAGS="$CFLAGS -g -O2"
     build_jpeg
     CFLAGS=$ORIGINAL_CFLAGS
-    
+
     build_tiff
     build_libpng
     build_lcms2
     build_openjpeg
 
-    if [ -n "$IS_OSX" ]; then
-        # Custom flags to allow building on OS X 10.10 and 10.11
-        build_giflib
-        
-        ORIGINAL_CPPFLAGS=$CPPFLAGS
-        CPPFLAGS=""
-    fi
     CFLAGS="$CFLAGS -O3 -DNDEBUG"
     build_libwebp
     CFLAGS=$ORIGINAL_CFLAGS
-    if [ -n "$IS_OSX" ]; then
-        CPPFLAGS=$ORIGINAL_CPPFLAGS
-    fi
 
     if [ -n "$IS_OSX" ]; then
         # Custom freetype build
-        build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no
+        build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no --with-brotli=no
     else
         build_freetype
     fi

From 39a366203c22543cf1a147a1de7510bd8e40b657 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Sat, 24 Oct 2020 02:17:04 +0100
Subject: [PATCH 4/8] run both tagged and latest

---
 .github/workflows/build.sh   |  33 ++++++++++
 .github/workflows/wheels.yml | 120 +++++++++++++++++------------------
 2 files changed, 93 insertions(+), 60 deletions(-)
 create mode 100755 .github/workflows/build.sh

diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh
new file mode 100755
index 000000000..d50d77e6b
--- /dev/null
+++ b/.github/workflows/build.sh
@@ -0,0 +1,33 @@
+
+if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+  # these cause a conflict with built webp and libtiff
+  brew remove --ignore-dependencies webp zstd xz libtiff
+fi
+
+if [[ "$MB_PYTHON_VERSION" == "pypy3.6-7.3" ]]; then
+  if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then
+    MB_ML_VER="2010"
+    DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"
+  else
+    MB_PYTHON_OSX_VER="10.9"
+  fi
+fi
+
+echo "::group::Install a virtualenv"
+  source multibuild/common_utils.sh
+  source multibuild/travis_steps.sh
+  # can't use default 7.3.1 on macOS due to https://foss.heptapod.net/pypy/pypy/-/issues/3229
+  LATEST_PP_7p3=7.3.2
+  pip install virtualenv
+  before_install
+echo "::endgroup::"
+
+echo "::group::Build wheel"
+  clean_code $REPO_DIR $BUILD_COMMIT
+  build_wheel $REPO_DIR $PLAT
+  ls -l "${GITHUB_WORKSPACE}/${WHEEL_SDIR}/"
+echo "::endgroup::"
+
+echo "::group::Test wheel"
+  install_run $PLAT
+echo "::endgroup::"
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 8b4421594..80f4d7e84 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -3,9 +3,19 @@ name: Wheels
 
 on: [push, pull_request, create]
 
+env:
+  REPO_DIR: Pillow
+  BUILD_DEPENDS: ""
+  TEST_DEPENDS: "pytest pytest-cov"
+  MACOSX_DEPLOYMENT_TARGET: "10.10"
+  WHEEL_SDIR: wheelhouse
+
 jobs:
   build:
+    name: ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }}
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os: [ "ubuntu-16.04", "macos-latest" ]
         python: [ "3.6", "3.7", "3.8", "3.9", "pypy3.6-7.3" ]
@@ -13,85 +23,75 @@ jobs:
         exclude:
           - os: "macos-latest"
             platform: "i686"
-      fail-fast: false
-
-    runs-on: ${{ matrix.os }}
-
-    name: ${{ matrix.python }} ${{ matrix.os }} ${{ matrix.platform }}
-
+        include:
+          - os: "macos-latest"
+            os-name: "osx"
+          - os: "ubuntu-16.04"
+            os-name: "xenial"
     env:
-      REPO_DIR: Pillow
       BUILD_COMMIT: HEAD
-      BUILD_DEPENDS: ""
-      TEST_DEPENDS: "pytest pytest-cov"
-      MACOSX_DEPLOYMENT_TARGET: "10.10"
-      WHEEL_SDIR: wheelhouse
       PLAT: ${{ matrix.platform }}
       MB_PYTHON_VERSION: ${{ matrix.python }}
-
+      TRAVIS_OS_NAME: ${{ matrix.os-name }}
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: true
-
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
+      - uses: actions/setup-python@v2
         with:
           python-version: 3.8
-
       - name: Build Wheel
-        run: |
-          echo "::group::Install a virtualenv"
-            if [[ "${{ matrix.os }}" == "macos-latest" ]]; then
-              # pretend we are on Travis CI
-              TRAVIS_OS_NAME="osx"
-              # these cause a conflict with built webp and libtiff
-              brew remove --ignore-dependencies webp zstd xz libtiff
-            fi
-            if [[ "${{ matrix.python }}" == "pypy3.6-7.3" ]]; then
-              # PyPy specific settings
-              if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then
-                MB_ML_VER="2010"
-                DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"
-              else
-                MB_PYTHON_OSX_VER="10.9"
-              fi
-            fi
-            source multibuild/common_utils.sh
-            source multibuild/travis_steps.sh
-            # can't use default 7.3.1 on macOS due to https://foss.heptapod.net/pypy/pypy/-/issues/3229
-            LATEST_PP_7p3=7.3.2
-            pip install virtualenv
-            before_install
-          echo "::endgroup::"
-
-          echo "::group::Build wheel"
-            if [[ "${{ startsWith(github.ref, 'refs/tags/') }}" == "false" ]]; then
-              BUILD_COMMIT=master
-            fi
-            clean_code $REPO_DIR $BUILD_COMMIT
-            build_wheel $REPO_DIR $PLAT
-            ls -l "${GITHUB_WORKSPACE}/${WHEEL_SDIR}/"
-          echo "::endgroup::"
-
-          echo "::group::Test wheel"
-            install_run $PLAT
-          echo "::endgroup::"
-
-#     Uncomment to get SSH access for testing
-#      - name: Setup tmate session
-#        if: failure()
-#        uses: mxschmitt/action-tmate@v3
-
+        run: .github/workflows/build.sh
       - uses: actions/upload-artifact@v2
         with:
           name: wheels
           path: wheelhouse/*.whl
+      # Uncomment to get SSH access for testing
+      # - name: Setup tmate session
+      #   if: failure()
+      #   uses: mxschmitt/action-tmate@v3
+
+  build-latest:
+    name: ${{ matrix.python }} ${{ matrix.os-name }} ${{ matrix.platform }} latest
+    runs-on: ${{ matrix.os }}
+    if: "!startsWith(github.ref, 'refs/tags/')"
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ "ubuntu-16.04", "macos-latest" ]
+        python: [ "3.6", "3.7", "3.8", "3.9", "pypy3.6-7.3" ]
+        platform: [ "x86_64", "i686" ]
+        exclude:
+          - os: "macos-latest"
+            platform: "i686"
+        include:
+          - os: "macos-latest"
+            os-name: "osx"
+          - os: "ubuntu-16.04"
+            os-name: "xenial"
+    env:
+      BUILD_COMMIT: master
+      PLAT: ${{ matrix.platform }}
+      MB_PYTHON_VERSION: ${{ matrix.python }}
+      TRAVIS_OS_NAME: ${{ matrix.os-name }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: true
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - name: Build Wheel
+        run: .github/workflows/build.sh
+      - uses: actions/upload-artifact@v2
+        with:
+          name: wheels-latest
+          path: wheelhouse/*.whl
 
   release:
     name: Create Release
     runs-on: ubuntu-latest
-    if: startsWith(github.ref, 'refs/tags/')
+    if: "startsWith(github.ref, 'refs/tags/')"
     needs: build
     steps:
       - uses: actions/download-artifact@v2

From f33661a80f76ef801952fdc112be582809e13ea2 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Sat, 24 Oct 2020 03:17:17 +0100
Subject: [PATCH 5/8] create event is redundant

---
 .github/workflows/wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 80f4d7e84..77c53df66 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -1,7 +1,7 @@
 
 name: Wheels
 
-on: [push, pull_request, create]
+on: [push, pull_request]
 
 env:
   REPO_DIR: Pillow

From b3f1056eaa9a817a87f66a168f7293f4ba7560f1 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Thu, 29 Oct 2020 18:05:24 +0000
Subject: [PATCH 6/8] put PyPy first

---
 .github/workflows/wheels.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 77c53df66..68c434ab9 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-16.04", "macos-latest" ]
-        python: [ "3.6", "3.7", "3.8", "3.9", "pypy3.6-7.3" ]
+        python: [ "pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ]
         platform: [ "x86_64", "i686" ]
         exclude:
           - os: "macos-latest"
@@ -59,7 +59,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ "ubuntu-16.04", "macos-latest" ]
-        python: [ "3.6", "3.7", "3.8", "3.9", "pypy3.6-7.3" ]
+        python: [ "pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ]
         platform: [ "x86_64", "i686" ]
         exclude:
           - os: "macos-latest"

From 2dc6e41167a09c2c9cc8db16929facce5e5b204f Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Sat, 31 Oct 2020 21:42:25 +0000
Subject: [PATCH 7/8] install Tcl/Tk for PyPy on macOS

---
 .github/workflows/build.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh
index d50d77e6b..1909e0eb4 100755
--- a/.github/workflows/build.sh
+++ b/.github/workflows/build.sh
@@ -1,5 +1,10 @@
 
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+  if [[ "$MB_PYTHON_VERSION" == "pypy3.6-7.3" ]]; then
+    # for https://foss.heptapod.net/pypy/pypy/-/issues/3229
+    # TODO remove when that is fixed
+    brew install tcl-tk
+  fi
   # these cause a conflict with built webp and libtiff
   brew remove --ignore-dependencies webp zstd xz libtiff
 fi

From ff8ba318a26ccc58d0e98c77cc730ee53b67001f Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Fri, 6 Nov 2020 23:27:16 +1100
Subject: [PATCH 8/8] Updated to Python 3.9

---
 .github/workflows/wheels.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 68c434ab9..e9ca07b13 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -39,7 +39,7 @@ jobs:
           submodules: true
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Build Wheel
         run: .github/workflows/build.sh
       - uses: actions/upload-artifact@v2
@@ -80,7 +80,7 @@ jobs:
           submodules: true
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Build Wheel
         run: .github/workflows/build.sh
       - uses: actions/upload-artifact@v2