Update cmake.yml

ruben2020 · Feb 3, 2024 · 17b5894 · 17b5894
1 parent 11f1701
commit 17b5894
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -62,6 +62,13 @@ jobs:
             cc: "clang",
             cxx: "clang++"
           }
+        - {
+            name: "Windows MinGW Qt6",
+            os: windows-latest,
+            build_type: "Debug",
+            cc: "gcc",
+            cxx: "g++"
+          }
         - {
             name: "Windows MinGW Qt5",
             os: windows-latest,
@@ -146,6 +153,16 @@ jobs:
           ninja --version
           brew info qt@5
 
+      - name: Install Qt6 on Windows
+        if: startsWith(matrix.config.name, 'Windows MinGW Qt6')
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '6.6.*'
+          host: 'windows'
+          target: 'desktop'
+          arch: 'win64_mingw'
+          cache: 'false'
+
       - name: Install Qt5 on Windows
         if: startsWith(matrix.config.name, 'Windows MinGW Qt5')
         uses: jurplel/install-qt-action@v3
@@ -228,14 +245,19 @@ jobs:
           ninja
           sudo ninja install
 
+      - name: Configure CMake and Build on Windows MinGW Qt6
+        shell: cmd
+        if: contains(matrix.config.name, 'Windows MinGW Qt6')
+        run: call "windows-install/win64/buildqt5win64_github.bat"
+
       - name: Configure CMake and Build on Windows MinGW Qt5
         shell: cmd
         if: contains(matrix.config.name, 'Windows MinGW Qt5')
         run: call "windows-install/win64/buildqt5win64_github.bat"
 
       - name: Test on Linux, MacOS
         shell: bash
-        if: ${{ !contains(matrix.config.name, 'Windows MinGW Qt5') }}
+        if: ${{ !contains(matrix.config.name, 'Windows MinGW') }}
         run: |
           cqmakedb -v
           cscope -cbR