From 3c9897799b74b55f91b4c3cf6150d3803d83ce50 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Sun, 30 Aug 2020 06:07:30 +0200
Subject: [PATCH 1/3] Revert "Merge pull request #4832 from radarhere/msys2_32"

This reverts commit d0dd3444a2b4fe71bd134fbfc1f35af125d2e317, reversing
changes made to afbbdf5f72faabe8d0eb92be7055a229b5b15101.
---
 .github/workflows/test-windows.yml | 48 ++++++++++++++++++------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 8508a4748..7f7343cd9 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -198,15 +198,25 @@ jobs:
   msys:
     runs-on: windows-2019
 
+    strategy:
+      fail-fast: false
+      matrix:
+        mingw: ["MINGW32", "MINGW64"]
+        include:
+          - mingw: "MINGW32"
+            package: "mingw-w64-i686"
+          - mingw: "MINGW64"
+            package: "mingw-w64-x86_64"
+
     defaults:
       run:
         shell: bash.exe --login -eo pipefail "{0}"
     env:
-      MSYSTEM: MINGW64
+      MSYSTEM: ${{ matrix.mingw }}
       CHERE_INVOKING: 1
 
     timeout-minutes: 30
-    name: MSYS2 MinGW 64-bit
+    name: MSYS2 ${{ matrix.mingw }}
 
     steps:
       - uses: actions/checkout@v2
@@ -218,22 +228,22 @@ jobs:
       - name: Install Dependencies
         run: |
           pacman -S --noconfirm \
-              mingw-w64-x86_64-python3-cffi \
-              mingw-w64-x86_64-python3-numpy \
-              mingw-w64-x86_64-python3-olefile \
-              mingw-w64-x86_64-python3-pip \
-              mingw-w64-x86_64-python3-pyqt5 \
-              mingw-w64-x86_64-python3-pytest \
-              mingw-w64-x86_64-python3-pytest-cov \
-              mingw-w64-x86_64-python3-setuptools \
-              mingw-w64-x86_64-freetype \
-              mingw-w64-x86_64-ghostscript \
-              mingw-w64-x86_64-lcms2 \
-              mingw-w64-x86_64-libimagequant \
-              mingw-w64-x86_64-libjpeg-turbo \
-              mingw-w64-x86_64-libraqm \
-              mingw-w64-x86_64-libwebp \
-              mingw-w64-x86_64-openjpeg2 \
+              ${{ matrix.package }}-python3-cffi \
+              ${{ matrix.package }}-python3-numpy \
+              ${{ matrix.package }}-python3-olefile \
+              ${{ matrix.package }}-python3-pip \
+              ${{ matrix.package }}-python3-pyqt5 \
+              ${{ matrix.package }}-python3-pytest \
+              ${{ matrix.package }}-python3-pytest-cov \
+              ${{ matrix.package }}-python3-setuptools \
+              ${{ matrix.package }}-freetype \
+              ${{ matrix.package }}-ghostscript \
+              ${{ matrix.package }}-lcms2 \
+              ${{ matrix.package }}-libimagequant \
+              ${{ matrix.package }}-libjpeg-turbo \
+              ${{ matrix.package }}-libraqm \
+              ${{ matrix.package }}-libwebp \
+              ${{ matrix.package }}-openjpeg2 \
               subversion
 
           python3 -m pip install pyroma
@@ -255,4 +265,4 @@ jobs:
           python3 -m pip install codecov
           bash <(curl -s https://codecov.io/bash) -F GHA_Windows
         env:
-          CODECOV_NAME: MSYS2 MinGW 64-bit
+          CODECOV_NAME: MSYS2 ${{ matrix.mingw }}

From facf73f8d0ffa08623e6ce542978f76cbc3699f0 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Sun, 30 Aug 2020 06:09:42 +0200
Subject: [PATCH 2/3] use proper names for MSYS2

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

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 7f7343cd9..a90a0a954 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -204,8 +204,10 @@ jobs:
         mingw: ["MINGW32", "MINGW64"]
         include:
           - mingw: "MINGW32"
+            name: "MSYS2 MinGW 32-bit"
             package: "mingw-w64-i686"
           - mingw: "MINGW64"
+            name: "MSYS2 MinGW 64-bit"
             package: "mingw-w64-x86_64"
 
     defaults:
@@ -216,7 +218,7 @@ jobs:
       CHERE_INVOKING: 1
 
     timeout-minutes: 30
-    name: MSYS2 ${{ matrix.mingw }}
+    name: ${{ matrix.name }}
 
     steps:
       - uses: actions/checkout@v2
@@ -265,4 +267,4 @@ jobs:
           python3 -m pip install codecov
           bash <(curl -s https://codecov.io/bash) -F GHA_Windows
         env:
-          CODECOV_NAME: MSYS2 ${{ matrix.mingw }}
+          CODECOV_NAME: ${{ matrix.name }}

From 22b8b25f2f9de99a88e1ed71cad333c92b67abe9 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Mon, 31 Aug 2020 00:50:45 +0200
Subject: [PATCH 3/3] update CI targets

---
 docs/installation.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installation.rst b/docs/installation.rst
index 706cfb1d7..4c41cc9ee 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -412,12 +412,12 @@ These platforms are built and tested for every change.
 | Windows Server 2016              | 3.8                      |x86                    |
 |                                  +--------------------------+-----------------------+
 |                                  | 3.6                      |x86-64                 |
-|                                  +--------------------------+-----------------------+
-|                                  | 3.7/MinGW                |x86                    |
 +----------------------------------+--------------------------+-----------------------+
 | Windows Server 2019              | 3.6, 3.7, 3.8            |x86, x86-64            |
 |                                  +--------------------------+-----------------------+
 |                                  | PyPy3                    |x86                    |
+|                                  +--------------------------+-----------------------+
+|                                  | 3.8/MinGW                |x86, x86-64            |
 +----------------------------------+--------------------------+-----------------------+