Revert "Merge pull request #4832 from radarhere/msys2_32"

This reverts commit d0dd3444a2, reversing
changes made to afbbdf5f72.

.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 }}