try

MerginMaps · Aug 4, 2023 · d034e79 · d034e79
1 parent 3182a2a
commit d034e79
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -28,7 +28,6 @@ jobs:
     runs-on: macos-12
     env:
       QT_VERSION: '6.5.2'
-      CMAKE_GENERATOR: "Ninja"
       ANDROIDAPI: 24
       NDK_VERSION: '25.1.8937393'
       NDK_VERSION_FULL: r25b
@@ -120,6 +119,7 @@ jobs:
           git remote add origin https://github.com/microsoft/vcpkg.git
           git pull origin master
           git checkout $VCPKG_BASELINE
+          ./bootstrap-vcpkg.sh
 
       - name: Build Deps
         run: |
@@ -139,7 +139,8 @@ jobs:
                 -D ANDROID_BUILD_TOOLS_VERSION="${ANDROID_BUILD_TOOLS_VERSION}" \
                 -D CMAKE_PREFIX_PATH=${Qt6_DIR} \
                 -D QT_HOST_PATH=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos \
-                -D QT_HOST_PATH_CMAKE_DIR:PATH=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos
+                -D QT_HOST_PATH_CMAKE_DIR:PATH=${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/macos \
+                -DCMAKE_MAKE_PROGRAM=ninja
 
       - name: Upload build logs on deps failure
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -20,7 +20,6 @@ jobs:
     env:
       QT_VERSION: '6.5.2'
       TRIPLET: "arm64-ios"
-      CMAKE_GENERATOR: "Ninja"
       DEPLOYMENT_TARGET: '14.0' # iOS Deployment target 
       XC_VERSION: ${{ '14.2' }}
       QT_ARCH: "ios"
@@ -88,6 +87,7 @@ jobs:
           git remote add origin https://github.com/microsoft/vcpkg.git
           git pull origin master
           git checkout $VCPKG_BASELINE
+          ./bootstrap-vcpkg.sh
 
       - name: Build Deps
         run: |
@@ -105,7 +105,8 @@ jobs:
                 -D CMAKE_OSX_DEPLOYMENT_TARGET=${{ env.DEPLOYMENT_TARGET }} \
                 -D ENABLE_BITCODE=OFF \
                 -D ENABLE_ARC=ON \
-                -D CMAKE_CXX_VISIBILITY_PRESET=hidden
+                -D CMAKE_CXX_VISIBILITY_PRESET=hidden \
+                -DCMAKE_MAKE_PROGRAM=ninja
                 
 
       - name: Upload build logs on deps failure

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -22,7 +22,6 @@ jobs:
     env:
       QT_VERSION: '6.5.2'
       TRIPLET: "x64-linux"
-      CMAKE_GENERATOR: "Ninja"
       QT_ARCH: "desktop"
       VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
       VCPKG_BASELINE: "d765306b074717dea8dc1c4723e1b025acb61c2d" # use scripts/update_vcpkg_base.bash to change
@@ -70,6 +69,7 @@ jobs:
           git remote add origin https://github.com/microsoft/vcpkg.git
           git pull origin master
           git checkout $VCPKG_BASELINE
+          ./bootstrap-vcpkg.sh
 
       - name: Build Deps
         run: |
@@ -84,7 +84,8 @@ jobs:
                 -G Ninja \
                 -DVCPKG_TARGET_TRIPLET=${{ env.TRIPLET }} \
                 -DVCPKG_OVERLAY_TRIPLETS:PATH="${{ github.workspace }}/vcpkg-overlay/triplets" \
-                -DVCPKG_OVERLAY_PORTS="${{ github.workspace }}/vcpkg-overlay/ports"
+                -DVCPKG_OVERLAY_PORTS="${{ github.workspace }}/vcpkg-overlay/ports"\
+                -DCMAKE_MAKE_PROGRAM=ninja
 
       - name: Upload build logs on deps failure
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -22,7 +22,6 @@ jobs:
     env:
       QT_VERSION: '6.5.2'
       TRIPLET: "x64-osx"
-      CMAKE_GENERATOR: "Ninja"
       DEPLOYMENT_TARGET: 10.15.0
       XC_VERSION: ${{ '14.2' }}
       QT_ARCH: "desktop"
@@ -76,6 +75,7 @@ jobs:
           git remote add origin https://github.com/microsoft/vcpkg.git
           git pull origin master
           git checkout $VCPKG_BASELINE
+          ./bootstrap-vcpkg.sh
 
       - name: Build Deps
         run: |

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
@@ -54,11 +54,6 @@ jobs:
           cache: true
           cache-key-prefix: ${{ runner.os }}-QtCache-v1-${{ env.QT_VERSION }}-win
 
-      - name: Setup compiler
-        shell: cmd
-        run: |
-            CALL "C:\Program Files (x86)\Microsoft Visual Studio\${{ env.VS_VERSION }}\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ env.CMAKE_ARCH }}
-
       - name: Restore vcpkg folder
         id: cache-vcpkg-restore
         if: ${{ github.ref != 'refs/heads/master' }} # do not use cache on master
@@ -77,7 +72,15 @@ jobs:
           git remote add origin https://github.com/microsoft/vcpkg.git
           git pull origin master
           git checkout $VCPKG_BASELINE
+          bootstrap-vcpkg.bat
 
+      - name: Setup compiler
+        shell: cmd
+        run: |
+            CALL "C:\Program Files (x86)\Microsoft Visual Studio\${{ env.VS_VERSION }}\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ env.CMAKE_ARCH }}
+            
+            cd 
+            
       - name: Build Deps
         shell: pwsh
         run: |