ci: generate fewer cache

NJUPT-SAST · Oct 23, 2024 · 28c04bc · 28c04bc
1 parent 78f8095
commit 28c04bc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,6 +21,8 @@ jobs:
         include:
         - rid: linux-x64
           rust_target: x86_64-unknown-linux-gnu
+          vcpkg_host_triplet: 'x64-linux-release'
+          vcpkg_target_triplet: 'x64-linux-release'
           os: ubuntu-24.04
           qt_arch: gcc_64
         - rid: win-x64
@@ -38,6 +40,10 @@ jobs:
         - rid: macos-x64
           osx_arch: x86_64
           rust_target: x86_64-apple-darwin
+          # Even on ARM64 macOS, it's out of the box to use x64 tools.
+          # Using x64 tools avoids the need to build Qt twice,
+          # and despite the Rosetta 2 overhead, it still offers faster performance.
+          vcpkg_host_triplet: 'x64-osx-release'
           vcpkg_target_triplet: 'x64-osx-release'
           os: macos-latest
 
@@ -90,13 +96,13 @@ jobs:
       with:
         version: '6.2.0'
         arch: ${{ matrix.qt_arch }}
-        cache: true
 
     - name: Setup Rust toolchain
       uses: moonrepo/setup-rust@v1
       with:
         channel: stable
         targets: ${{ matrix.rust_target }}
+        cache: false
       env:
         GITHUB_TOKEN: ${{ github.token }}
 

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -83,13 +83,13 @@ jobs:
       with:
         version: 6.6.3
         arch: gcc_64
-        cache: true
         cache-key-prefix: ${{ runner.os }}-qt
 
     - name: Setup Rust toolchain
       uses: moonrepo/setup-rust@v1
       with:
         channel: stable
+        cache: false
       env:
         GITHUB_TOKEN: ${{ github.token }}
 
@@ -98,12 +98,12 @@ jobs:
       with:
         path: |
           ${{ github.workspace }}/build/_deps
-          ${{ github.workspace }}/build/lib
           ${{ github.workspace }}/build/*/cargo/build
           !${{ github.workspace }}/build/*/cargo/build/**/incremental
           ${{ github.workspace }}/build/corrosion/**/target
           !${{ github.workspace }}/build/corrosion/**/target/**/incremental
-        key: corrosion-linux-x64
+        key: corrosion-linux-x64-${{ github.run_id }}
+        restore-keys: corrosion-linux-x64-
 
     - name: Setup CMake
       uses: lukka/get-cmake@latest
@@ -122,11 +122,14 @@ jobs:
 
     - if: matrix.build-mode == 'manual'
       name: Build with CMake
-      uses: lukka/run-cmake@v10
-      with:
-        configurePreset: 'native'
-        buildPreset: 'native'
-        configurePresetAdditionalArgs: "['-DSPEED_UP_DEBUG_BUILD=ON']"
+      shell: pwsh
+      run: |
+        $additionalConfigureArgs = @()
+        $additionalConfigureArgs += "-DVCPKG_HOST_TRIPLET:STRING=x64-linux-release"
+        $additionalConfigureArgs += "-DVCPKG_TARGET_TRIPLET:STRING=x64-linux-release"
+        $additionalConfigureArgs += "-DSPEED_UP_DEBUG_BUILD=ON"
+        cmake --preset native @additionalConfigureArgs
+        cmake --build --preset native
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v3