Fix CI

maplibre · Jan 2, 2024 · afe573b · afe573b
1 parent 268d6d2
commit afe573b
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/.github/workflows/Windows.yml b/.github/workflows/Windows.yml
@@ -90,7 +90,7 @@ jobs:
           aqtversion: ==3.1.*
           version: ${{ matrix.qt_version }}
           target: desktop
-          arch: ${{ matrix.arch }}
+          arch: ${{ matrix.qt_arch }}
           modules: ${{ matrix.qt_modules }}
 
       - name: Setup ninja
@@ -114,7 +114,25 @@ jobs:
           key: Windows_QMapLibre_${{ matrix.qt_version }}_${{ matrix.arch }}
           max-size: 200M
 
-      - name: Build QMapLibre
+      - name: Build QMapLibre (Qt 5)
+        if: matrix.qt_series == 5
+        shell: bash
+        env:
+          COMPILER_TYPE: ${{ matrix.compiler }}
+        run: |
+          mkdir build && cd build
+          cmake.exe ../source/ \
+            -G"Ninja Multi-Config" \
+            -DCMAKE_CONFIGURATION_TYPES="Release;Debug" \
+            -DCMAKE_C_COMPILER_LAUNCHER="ccache.exe" \
+            -DCMAKE_CXX_COMPILER_LAUNCHER="ccache.exe" \
+            -DCMAKE_INSTALL_PREFIX="../install" \
+          ninja.exe
+          ninja.exe test
+          ninja.exe install
+
+      - name: Build QMapLibre (Qt 6)
+        if: matrix.qt_series == 6
         shell: bash
         env:
           COMPILER_TYPE: ${{ matrix.compiler }}