Merge branch 'master'

.github/workflows/cmake_windows_msys2.yml

@@ -11,6 +11,7 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
+      - "!.github/workflows/**"
       - .github/workflows/cmake_windows_msys2.yml
       - vcpkg.json
       - "!**/Makefile*"
@@ -21,6 +22,7 @@ on:
       - cmake/**
       - "**/CMakeLists.txt"
       - "CMakePresets.json"
+      - "!.github/workflows/**"
       - .github/workflows/cmake_windows_msys2.yml
       - vcpkg.json
       - "!**/Makefile*"
@@ -28,13 +30,11 @@ on:
 jobs:
 
   msys2:
+
     name: "${{ matrix.build.name }}, ${{ matrix.dynarec.name }}, ${{ matrix.environment.msystem }}"
 
     runs-on: ${{ matrix.environment.runner }}
 
-    env:
-      BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
-
     defaults:
       run:
         shell: msys2 {0}
@@ -43,23 +43,47 @@ jobs:
       fail-fast: true
       matrix:
         build:
-          - name: Dev Debug
+#          - name: Regular
+#            preset: regular
+          - name: Debug
             preset: dev_debug
-            slug: -Dev-Debug
+            slug: -Debug
           - name: Dev
             preset: development
             slug: -Dev
         dynarec:
           - name: ODR
             new: off
+            slug: -ODR
           - name: NDR
             new: on
             slug: -NDR
+        ui:
+          - name: Qt GUI
+            qt: on
+            static: on
+            slug: -Qt
+            packages: >-
+              qt5-base:p
+              qt5-tools:p
+              vulkan-headers:p
         environment:
+#          - msystem: MSYS
+#            toolchain: ./cmake/flags-gcc-x86_64.cmake
+#            slug: "-MSYS64"
           - msystem: MINGW64
+            prefix: mingw-w64-x86_64
             toolchain: ./cmake/flags-gcc-x86_64.cmake
             slug: "-64"
             runner: windows-2022
+#          - msystem: CLANG64
+#            prefix: mingw-w64-clang-x86_64
+#            toolchain: ./cmake/llvm-win32-x86_64.cmake
+#            slug: "CLANG64"
+#          - msystem: UCRT64
+#            prefix: mingw-w64-ucrt-x86_64
+#            toolchain: ./cmake/flags-gcc-x86_64.cmake
+#            slug: "UCRT64"
           - msystem: CLANGARM64
             toolchain: ./cmake/flags-gcc-aarch64.cmake
             slug: -arm64
@@ -100,9 +124,6 @@ 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: Configure CMake
         run: >-
           cmake -G Ninja -S . -B build --preset ${{ matrix.build.preset }}
@@ -110,20 +131,9 @@ 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: 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