From d07038961fa6e428f58493660484d0d3e0849907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Tue, 15 Apr 2025 11:15:42 +0200
Subject: [PATCH 1/9] Add win11arm job

---
 .github/workflows/cmake_windows_msys2.yml | 35 +++++++----------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index abe25b949..495937b10 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -18,7 +18,6 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
-      - .github/workflows/**
       - .github/workflows/cmake_windows_msys2.yml
       - vcpkg.json
       - "!**/Makefile*"
@@ -26,9 +25,9 @@ on:
 jobs:
 
   msys2:
-    name: "${{ matrix.ui.name }}, ${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
+    name: "${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
 
-    runs-on: windows-2022
+    runs-on: ${{ matrix.environment.runner }}
 
     env:
       BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
@@ -41,8 +40,6 @@ jobs:
       fail-fast: true
       matrix:
         build:
-#          - name: Regular
-#            preset: regular
           - name: Debug
             preset: dev_debug
             slug: -Debug
@@ -56,26 +53,15 @@ jobs:
           - name: NDR
             new: on
             slug: -NDR
-        ui:
-          - name: Qt GUI
-            qt: on
-            static: on
-            slug: -Qt
-            packages: >-
-              qt5-static:p
-              vulkan-headers:p
         environment:
-#          - msystem: MSYS
-#            toolchain: ./cmake/flags-gcc-x86_64.cmake
           - msystem: MINGW64
-            prefix: mingw-w64-x86_64
             toolchain: ./cmake/flags-gcc-x86_64.cmake
-#          - msystem: CLANG64
-#            prefix: mingw-w64-clang-x86_64
-#            toolchain: ./cmake/llvm-win32-x86_64.cmake
-#          - msystem: UCRT64
-#            prefix: mingw-w64-ucrt-x86_64
-#            toolchain: ./cmake/flags-gcc-x86_64.cmake
+            slug: -x64
+            runner: windows-2022
+          - msystem: CLANGARM64
+            toolchain: ./cmake/flags-gcc-aarch64.cmake
+            slug: -ARM64
+            runner: windows-11-arm
 
     steps:
       - name: Prepare MSYS2 environment
@@ -98,7 +84,8 @@ jobs:
             libslirp:p
             fluidsynth:p
             libserialport:p
-            ${{ matrix.ui.packages }}
+            qt5-static:p
+            vulkan-headers:p
 
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -114,8 +101,6 @@ jobs:
           --toolchain ${{ matrix.environment.toolchain }}
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
           -D CMAKE_INSTALL_PREFIX=./build/artifacts
-          -D QT=${{ matrix.ui.qt }}
-          -D STATIC_BUILD=${{ matrix.ui.static }}
 
       - name: Build
         run: |

From 775c7bd3d61c356d74fa51b7dd865fd77559a861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Tue, 15 Apr 2025 11:26:14 +0200
Subject: [PATCH 2/9] Try to fix the job

---
 .github/workflows/cmake_windows_msys2.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index 495937b10..f3262c4d5 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -40,11 +40,10 @@ jobs:
       fail-fast: true
       matrix:
         build:
-          - name: Debug
-            preset: dev_debug
-            slug: -Debug
+          - name: Regular
+            preset: regular
           - name: Dev
-            preset: development
+            preset: dev_debug
             slug: -Dev
         dynarec:
           - name: ODR
@@ -60,14 +59,19 @@ jobs:
             runner: windows-2022
           - msystem: CLANGARM64
             toolchain: ./cmake/flags-gcc-aarch64.cmake
-            slug: -ARM64
+            slug: -arm64
             runner: windows-11-arm
+        exclude:
+          - dynarec:
+              new: off
+            environment:
+              msystem: CLANGARM64
 
     steps:
       - name: Prepare MSYS2 environment
         uses: msys2/setup-msys2@v2
         with:
-          release: false
+          release: true
           update: true
           msystem: ${{ matrix.environment.msystem }}
           pacboy: >-

From 1080389bfd403b561935b8fe8ae43bd99f680f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Tue, 15 Apr 2025 11:35:48 +0200
Subject: [PATCH 3/9] Fix number 2

---
 .github/workflows/cmake_windows_msys2.yml | 26 ++++++++++++-----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index f3262c4d5..b2bb9b3a6 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -96,8 +96,8 @@ jobs:
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
 
-      - name: Install sonar-scanner and build-wrapper
-        uses: SonarSource/sonarcloud-github-c-cpp@v3
+      # - name: Install sonar-scanner and build-wrapper
+      #   uses: SonarSource/sonarcloud-github-c-cpp@v3
 
       - name: Configure CMake
         run: >-
@@ -106,17 +106,19 @@ jobs:
           -D NEW_DYNAREC=${{ matrix.dynarec.new }}
           -D CMAKE_INSTALL_PREFIX=./build/artifacts
 
-      - name: Build
-        run: |
-          .sonar/build-wrapper-win-x86/build-wrapper-win-x86-64.exe --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
+      # - name: Build
+      #   run: |
+      #     .sonar/build-wrapper-win-x86/build-wrapper-win-x86-64.exe --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build
 
-      - name: Run sonar-scanner
-        if: 0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          .sonar/sonar-scanner-5.0.1.3006-windows/bin/sonar-scanner.bat --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
+      - name: Build
+        run: cmake --build build
+
+      # - name: Run sonar-scanner
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      #   run: |
+      #     .sonar/sonar-scanner-5.0.1.3006-windows/bin/sonar-scanner.bat --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}"
 
       - name: Generate package
         run: cmake --install build

From 52458f78439c255886b8e54de95beb9d0c7e4770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Tue, 15 Apr 2025 11:43:11 +0200
Subject: [PATCH 4/9] Fix number 3

---
 .github/workflows/cmake_windows_msys2.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index b2bb9b3a6..f94853279 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -90,6 +90,7 @@ jobs:
             libserialport:p
             qt5-static:p
             vulkan-headers:p
+            openmp:p
 
       - name: Checkout repository
         uses: actions/checkout@v4

From fe9f6a7f1daafa8cf7747f4270bb6af8baf1bef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Tue, 15 Apr 2025 11:54:21 +0200
Subject: [PATCH 5/9] Artifact names in line with Jenkins

---
 .github/workflows/cmake_windows_msys2.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index f94853279..d9cd37d0d 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -48,14 +48,13 @@ jobs:
         dynarec:
           - name: ODR
             new: off
-            slug: -ODR
           - name: NDR
             new: on
             slug: -NDR
         environment:
           - msystem: MINGW64
             toolchain: ./cmake/flags-gcc-x86_64.cmake
-            slug: -x64
+            slug: "-64"
             runner: windows-2022
           - msystem: CLANGARM64
             toolchain: ./cmake/flags-gcc-aarch64.cmake
@@ -127,5 +126,5 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: '86Box${{ matrix.ui.slug }}${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows-${{ matrix.environment.msystem }}-gha${{ github.run_number }}'
+          name: '86Box${{ matrix.dynarec.slug }}${{ matrix.build.slug }}${{ matrix.environment.slug }}-gha${{ github.run_number }}'
           path: build/artifacts/**

From 1b61f58bf00ce333c7baf4d6235b1cfd0816f486 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Tue, 15 Apr 2025 11:55:11 +0200
Subject: [PATCH 6/9] Fix

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

diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index d9cd37d0d..44d982e16 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -126,5 +126,5 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: '86Box${{ matrix.dynarec.slug }}${{ matrix.build.slug }}${{ matrix.environment.slug }}-gha${{ github.run_number }}'
+          name: '86Box${{ matrix.dynarec.slug }}${{ matrix.build.slug }}-Windows${{ matrix.environment.slug }}-gha${{ github.run_number }}'
           path: build/artifacts/**

From 9b54021061a09ebf5588425279f95d2428faefb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Tue, 15 Apr 2025 19:10:18 +0200
Subject: [PATCH 7/9] Use debug instead of release

---
 .github/workflows/cmake_windows_msys2.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index 44d982e16..9dda6a695 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -40,8 +40,9 @@ jobs:
       fail-fast: true
       matrix:
         build:
-          - name: Regular
-            preset: regular
+          - name: Debug
+            preset: debug
+            slug: -Debug
           - name: Dev
             preset: dev_debug
             slug: -Dev

From 90134095b95b36f9635d036bb8aababcb784256a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Tue, 15 Apr 2025 19:16:59 +0200
Subject: [PATCH 8/9] Fix the presets once again

---
 .github/workflows/cmake_windows_msys2.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index 9dda6a695..98aae1883 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -40,11 +40,11 @@ jobs:
       fail-fast: true
       matrix:
         build:
-          - name: Debug
+          - name: Dev Debug
             preset: debug
-            slug: -Debug
+            slug: -Dev-Debug
           - name: Dev
-            preset: dev_debug
+            preset: development
             slug: -Dev
         dynarec:
           - name: ODR

From bb0b8f254de968e9b0de8918467dea741f83a7e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?=
 <13226155+dhrdlicka@users.noreply.github.com>
Date: Tue, 15 Apr 2025 19:19:39 +0200
Subject: [PATCH 9/9] ...

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

diff --git a/.github/workflows/cmake_windows_msys2.yml b/.github/workflows/cmake_windows_msys2.yml
index 98aae1883..ca48599a0 100644
--- a/.github/workflows/cmake_windows_msys2.yml
+++ b/.github/workflows/cmake_windows_msys2.yml
@@ -41,7 +41,7 @@ jobs:
       matrix:
         build:
           - name: Dev Debug
-            preset: debug
+            preset: dev_debug
             slug: -Dev-Debug
           - name: Dev
             preset: development