actions: combine the two MSYS2 jobs into one

.github/workflows/cmake.yml

@@ -25,7 +25,7 @@ on:
 
 jobs:
   msys2:
-    name: MSYS2 (Win32 GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }})
+    name: MSYS2 (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }})
 
     runs-on: windows-2022
 
@@ -50,6 +50,17 @@ jobs:
           - name: NDR
             new: on
             slug: -NDR
+        ui:
+          - name: Win32 GUI
+            qt: off
+            static: on
+          - name: Qt GUI
+            qt: on
+            static: off
+            slug: -Qt
+            packages: >-
+              qt5-base:p
+              qt5-tools:p
         environment:
           - msystem: MINGW32
             prefix: mingw-w64-i686
@@ -64,20 +75,20 @@ jobs:
     steps:
       - uses: msys2/setup-msys2@v2
         with:
-          path-type: inherit
           update: true
           msystem: ${{ matrix.environment.msystem }}
-          install: >-
+          pacboy: >-
-            ${{ matrix.environment.prefix }}-ninja
+            ninja:p
-            ${{ matrix.environment.prefix }}-cc
+            cmake:p
-            ${{ matrix.environment.prefix }}-pkg-config
+            cc:p
-            ${{ matrix.environment.prefix }}-freetype
+            pkg-config:p
-            ${{ matrix.environment.prefix }}-SDL2
+            freetype:p
-            ${{ matrix.environment.prefix }}-zlib
+            SDL2:p
-            ${{ matrix.environment.prefix }}-libpng
+            zlib:p
-            ${{ matrix.environment.prefix }}-libvncserver
+            libpng:p
-            ${{ matrix.environment.prefix }}-openal
+            openal:p
-            ${{ matrix.environment.prefix }}-rtmidi
+            rtmidi:p
+            ${{ matrix.ui.packages }}
       - uses: actions/checkout@v3
       - name: Configure CMake
         run: >-
@@ -85,7 +96,8 @@ jobs:
           --toolchain ${{ matrix.environment.toolchain }}
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
           -D CMAKE_INSTALL_PREFIX=./build/artifacts
-          -D QT=OFF
+          -D QT=${{ matrix.ui.qt }}
+          -D STATIC_BUILD=${{ matrix.ui.static }}
       - name: Build
         run: cmake --build build
       - name: Generate package
@@ -95,80 +107,6 @@ jobs:
           name: '86Box${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
           path: build/artifacts/**
 
-  msys2-qt:
-    name: MSYS2 (Qt GUI, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }})
-
-    runs-on: windows-2022
-
-    defaults:
-      run:
-        shell: msys2 {0}
-
-    strategy:
-      fail-fast: true
-      matrix:
-        build:
-          - name: Debug
-            preset: debug
-            slug: -Debug
-          - name: Dev
-            preset: experimental
-            slug: -Dev
-        dynarec:
-          - name: ODR
-            new: off
-            slug: -ODR
-          - name: NDR
-            new: on
-            slug: -NDR
-        environment:
-          - msystem: MINGW32
-            prefix: mingw-w64-i686
-            toolchain: ./cmake/flags-gcc-i686.cmake
-          - msystem: MINGW64
-            prefix: mingw-w64-x86_64
-            toolchain: ./cmake/flags-gcc-x86_64.cmake
-          - msystem: UCRT64
-            prefix: mingw-w64-ucrt-x86_64
-            toolchain: ./cmake/flags-gcc-x86_64.cmake
-
-    steps:
-      - uses: msys2/setup-msys2@v2
-        with:
-          path-type: inherit
-          update: true
-          msystem: ${{ matrix.environment.msystem }}
-          install: >-
-            ${{ matrix.environment.prefix }}-ninja
-            ${{ matrix.environment.prefix }}-cc
-            ${{ matrix.environment.prefix }}-pkg-config
-            ${{ matrix.environment.prefix }}-freetype
-            ${{ matrix.environment.prefix }}-SDL2
-            ${{ matrix.environment.prefix }}-zlib
-            ${{ matrix.environment.prefix }}-libpng
-            ${{ matrix.environment.prefix }}-libvncserver
-            ${{ matrix.environment.prefix }}-openal
-            ${{ matrix.environment.prefix }}-rtmidi
-            ${{ matrix.environment.prefix }}-qt5-base
-            ${{ matrix.environment.prefix }}-qt5-tools
-      - uses: actions/checkout@v3
-      - name: Configure CMake
-        run: >-
-          cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
-          --toolchain ${{ matrix.environment.toolchain }}
-          -D NEW_DYNAREC=${{ matrix.dynarec.new }}
-          -D CMAKE_INSTALL_PREFIX=./build/artifacts
-          -D QT=ON
-      - name: Build
-        run: cmake --build build
-      - name: Generate package
-        if: matrix.environment.msystem != 'MINGW32'
-        run: cmake --install build
-      - uses: actions/upload-artifact@v3
-        with:
-          name: '86Box-Qt${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
-          path: build/artifacts/**
-
   llvm-windows:
     name: "Windows vcpkg/LLVM (${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.target.name }})"