Move wxMSW/clang CI job to the workflow using CMake

This job uses CMake and not MSBuild, so move it to the appropriate
workflow.

.github/workflows/ci_cmake.yml

@@ -85,7 +85,7 @@ jobs:
             cmake_samples: OFF
             cmake_tests: OFF
             cmake_build_toolkit: osx_iphone
-          - name: Windows wxMSW
+          - name: MSW/MSVC wxMSW
             runner: windows-latest
             no_sudo: 1
             cmake_defines: -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe
@@ -93,7 +93,7 @@ jobs:
             cmake_samples: SOME
             cmake_tests: CONSOLE_ONLY
             cmake_build_toolkit: msw
-          - name: Windows wxQt 6.8
+          - name: MSW/MSVC wxQt 6.8
             runner: windows-latest
             no_sudo: 1
             cmake_defines: -DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe
@@ -102,14 +102,26 @@ jobs:
             cmake_tests: ALL
             cmake_build_toolkit: qt
             skip_installation: true
+          - name: MSW/Clang wxMSW
+            shell: msys2 {0}
+            runner: windows-latest
+            no_sudo: 1
+            cmake_defines: -DCMAKE_C_COMPILER=clang.exe -DCMAKE_CXX_COMPILER=clang++.exe -DCMAKE_CXX_FLAGS="-DwxENABLE_EXTRA_WARNINGS -Werror -Wsuggest-override" -DCMAKE_BUILD_TYPE=Release -DwxBUILD_DEMOS=ON -DwxUSE_WEBVIEW_EDGE=ON
+            cmake_generator: MinGW Makefiles
+            cmake_samples: ALL
+            cmake_tests: OFF
+            cmake_build_toolkit: msw
+            skip_installation: true
 
     env:
       wxGTK_VERSION: ${{ matrix.gtk_version && matrix.gtk_version || 3 }}
 
     # Use bash as the shell, even under MSW where the default is PowerShell.
+    # Except for the MSYS2 shell, which must be used to find MSYS2 clang
+    # instead of native clang.
     defaults:
       run:
-        shell: bash
+        shell: ${{ matrix.shell || 'bash' }}
 
     steps:
       - name: Checkout
@@ -117,6 +129,14 @@ jobs:
         with:
           submodules: 'recursive'
 
+      - name: Setup MSYS2
+        if: matrix.cmake_generator == 'MinGW Makefiles'
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: mingw64
+          update: true
+          install: mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang
+
       - name: Install Qt6
         if: ${{ matrix.cmake_build_toolkit }} == 'qt'
         uses: jurplel/install-qt-action@v4
@@ -170,9 +190,10 @@ jobs:
         run: |
           ./build/tools/before_install.sh
 
-      # required for CMake to find Ninja
-      - name: "[Windows] Set up MSVC Developer Command Prompt"
-        if: runner.os == 'Windows'
+      # required for CMake to find Ninja but shouldn't be used when using
+      # MSYS2, or we'd end up using MSVC clang instead of its own.
+      - name: Setup MSVC Environment
+        if: ${{ runner.os == 'Windows' && matrix.cmake_generator != 'MinGW Makefiles' }}
         uses: wxWidgets/gha-setup-vsdevenv@wx
 
       - name: Configuring

.github/workflows/ci_msw.yml

@@ -149,50 +149,6 @@ jobs:
         run: |
             .\vc*msw*\test_gui.exe
 
-  msw-msys2-clang:
-    runs-on: windows-latest
-    name: wxMSW Clang
-
-    defaults:
-      run:
-        shell: msys2 {0}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: 'recursive'
-
-      - name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: mingw64
-          update: true
-          install: mingw-w64-x86_64-cmake mingw-w64-x86_64-toolchain mingw-w64-x86_64-clang
-
-      - name: Configuring
-        run: |
-          clang --version
-          cmake --version
-          mkdir build_cmake
-          pushd build_cmake
-          cmake -G "MinGW Makefiles" \
-                -DCMAKE_C_COMPILER=clang.exe \
-                -DCMAKE_CXX_COMPILER=clang++.exe \
-                -DCMAKE_CXX_FLAGS="-DwxENABLE_EXTRA_WARNINGS -Werror -Wsuggest-override" \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DwxBUILD_SAMPLES=ALL \
-                -DwxBUILD_TESTS=ALL \
-                -DwxBUILD_DEMOS=ON \
-                -DwxUSE_WEBVIEW_EDGE=ON \
-                ..
-
-      - name: Building
-        working-directory: build_cmake
-        run: |
-          wxPROC_COUNT=`../build/tools/proc_count.sh`
-          cmake --build . -- -j$wxPROC_COUNT
-
   qt-msvs:
     runs-on: windows-2022
     name: wxQt vs2022 DLL Debug x64