diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b4d6c1bf..654c54da1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,8 +25,6 @@ jobs: env: CARGO_TERM_COLOR: always CARGO_INCREMENTAL: "0" - RUSTC_WRAPPER: sccache - SCCACHE_GHA_ENABLED: "true" defaults: run: working-directory: rust_hft @@ -210,17 +208,12 @@ jobs: if: steps.scope.outputs.toolchain == 'true' run: sudo apt-get update && sudo apt-get install -y clang mold protobuf-compiler shellcheck - - name: Setup sccache - if: steps.scope.outputs.toolchain == 'true' - uses: mozilla-actions/sccache-action@v0.0.10 - - name: Record cache dimensions if: steps.scope.outputs.toolchain == 'true' id: cache-info shell: bash run: | echo "rust=$(rustc -Vv | awk '/^release:/ {print $2}')" >> "$GITHUB_OUTPUT" - echo "sccache=$(${SCCACHE_PATH:-sccache} --version | awk '{print $2}')" >> "$GITHUB_OUTPUT" - name: Cache Rust if: steps.scope.outputs.toolchain == 'true' @@ -228,7 +221,7 @@ jobs: with: workspaces: | rust_hft - key: rust_hft-ci-rust-${{ steps.cache-info.outputs.rust }}-sccache-${{ steps.cache-info.outputs.sccache }}-${{ hashFiles('rust_hft/Cargo.lock') }} + key: rust_hft-ci-rust-${{ steps.cache-info.outputs.rust }}-${{ hashFiles('rust_hft/Cargo.lock') }} cache-all-crates: false save-if: ${{ github.event_name != 'pull_request' }} @@ -352,8 +345,6 @@ jobs: env: CARGO_TERM_COLOR: always CARGO_INCREMENTAL: "0" - RUSTC_WRAPPER: sccache - SCCACHE_GHA_ENABLED: "true" defaults: run: working-directory: rust_hft @@ -369,22 +360,18 @@ jobs: - name: Install Linux build tools run: sudo apt-get update && sudo apt-get install -y clang mold protobuf-compiler - - name: Setup sccache - uses: mozilla-actions/sccache-action@v0.0.10 - - name: Record cache dimensions id: cache-info shell: bash run: | echo "rust=$(rustc -Vv | awk '/^release:/ {print $2}')" >> "$GITHUB_OUTPUT" - echo "sccache=$(${SCCACHE_PATH:-sccache} --version | awk '{print $2}')" >> "$GITHUB_OUTPUT" - name: Cache Rust uses: Swatinem/rust-cache@v2 with: workspaces: | rust_hft - key: hft-engine-fast-lane-${{ steps.cache-info.outputs.rust }}-sccache-${{ steps.cache-info.outputs.sccache }}-${{ hashFiles('rust_hft/Cargo.lock') }} + key: hft-engine-fast-lane-${{ steps.cache-info.outputs.rust }}-${{ hashFiles('rust_hft/Cargo.lock') }} cache-all-crates: false save-if: ${{ github.event_name != 'pull_request' }}