From 61125ef7fa97866acd71d93fb27d85785ff4e63e Mon Sep 17 00:00:00 2001 From: Jack Amadeo Date: Thu, 6 Nov 2025 16:26:26 -0800 Subject: [PATCH] differentiate debug/release in cache key (#5613) --- .github/workflows/build-cli.yml | 6 +++--- .github/workflows/bundle-desktop-intel.yml | 4 ++-- .github/workflows/bundle-desktop-linux.yml | 4 ++-- .github/workflows/bundle-desktop-windows.yml | 6 +++--- .github/workflows/bundle-desktop.yml | 6 +++--- .github/workflows/ci.yml | 4 ++-- .github/workflows/pr-smoke-test.yml | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml index 188f8388be..5aede7a1db 100644 --- a/.github/workflows/build-cli.yml +++ b/.github/workflows/build-cli.yml @@ -97,10 +97,10 @@ jobs: uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f with: path: target - key: ${{ runner.os }}-cargo-build-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('rust-toolchain.toml') }} + key: ${{ runner.os }}-cargo-build-release-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('rust-toolchain.toml') }} restore-keys: | - ${{ runner.os }}-cargo-build-${{ hashFiles('Cargo.lock') }}- - ${{ runner.os }}-cargo-build- + ${{ runner.os }}-cargo-build-release-${{ hashFiles('Cargo.lock') }}- + ${{ runner.os }}-cargo-build-release- - name: Build CLI (Linux/macOS) if: matrix.use-cross diff --git a/.github/workflows/bundle-desktop-intel.yml b/.github/workflows/bundle-desktop-intel.yml index f1b0015359..a8d698b825 100644 --- a/.github/workflows/bundle-desktop-intel.yml +++ b/.github/workflows/bundle-desktop-intel.yml @@ -83,9 +83,9 @@ jobs: uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # pin@v3 with: path: target - key: ${{ runner.os }}-intel-cargo-build-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-intel-cargo-build-release-${{ hashFiles('**/Cargo.lock') }} restore-keys: | - ${{ runner.os }}-intel-cargo-build- + ${{ runner.os }}-intel-cargo-build-release- - name: Build goose-server for Intel macOS (x86_64) diff --git a/.github/workflows/bundle-desktop-linux.yml b/.github/workflows/bundle-desktop-linux.yml index 426d139e08..8d24787c9d 100644 --- a/.github/workflows/bundle-desktop-linux.yml +++ b/.github/workflows/bundle-desktop-linux.yml @@ -95,9 +95,9 @@ jobs: ${{ env.CARGO_HOME }}/registry/index/ ${{ env.CARGO_HOME }}/registry/cache/ ${{ env.CARGO_HOME }}/git/db/ - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-cargo-release-${{ hashFiles('**/Cargo.lock') }} restore-keys: | - ${{ runner.os }}-cargo- + ${{ runner.os }}-cargo-release- - name: Build goosed binary env: diff --git a/.github/workflows/bundle-desktop-windows.yml b/.github/workflows/bundle-desktop-windows.yml index 433ed661c5..bbde5345f6 100644 --- a/.github/workflows/bundle-desktop-windows.yml +++ b/.github/workflows/bundle-desktop-windows.yml @@ -92,10 +92,10 @@ jobs: uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f with: path: target - key: ${{ runner.os }}-cargo-build-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('rust-toolchain.toml') }} + key: ${{ runner.os }}-cargo-build-release-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('rust-toolchain.toml') }} restore-keys: | - ${{ runner.os }}-cargo-build-${{ hashFiles('Cargo.lock') }}- - ${{ runner.os }}-cargo-build- + ${{ runner.os }}-cargo-build-release-${{ hashFiles('Cargo.lock') }}- + ${{ runner.os }}-cargo-build-release- # 4) Build Rust for Windows using Docker (cross-compilation with enhanced caching) - name: Build Windows executable using Docker cross-compilation with enhanced caching diff --git a/.github/workflows/bundle-desktop.yml b/.github/workflows/bundle-desktop.yml index 978242a621..dd9f58cc6b 100644 --- a/.github/workflows/bundle-desktop.yml +++ b/.github/workflows/bundle-desktop.yml @@ -128,9 +128,9 @@ jobs: uses: actions/cache@2f8e54208210a422b2efd51efaa6bd6d7ca8920f # pin@v3 with: path: target - key: ${{ runner.os }}-cargo-build-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-cargo-build-release-${{ hashFiles('**/Cargo.lock') }} restore-keys: | - ${{ runner.os }}-cargo-build- + ${{ runner.os }}-cargo-build-release- # Build the project - name: Build goosed @@ -296,4 +296,4 @@ jobs: exit 1 fi # Kill the app to clean up - pkill -f "Goose.app/Contents/MacOS/Goose" \ No newline at end of file + pkill -f "Goose.app/Contents/MacOS/Goose" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4242db3718..3a3395fccc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,9 +73,9 @@ jobs: ${{ env.CARGO_HOME }}/registry/cache/ ${{ env.CARGO_HOME }}/git/db/ target/ - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-cargo-debug-${{ hashFiles('**/Cargo.lock') }} restore-keys: | - ${{ runner.os }}-cargo- + ${{ runner.os }}-cargo-debug- - name: Build and Test run: | diff --git a/.github/workflows/pr-smoke-test.yml b/.github/workflows/pr-smoke-test.yml index 2640db0086..124c0fcb45 100644 --- a/.github/workflows/pr-smoke-test.yml +++ b/.github/workflows/pr-smoke-test.yml @@ -73,9 +73,9 @@ jobs: ${{ env.CARGO_HOME }}/registry/cache/ ${{ env.CARGO_HOME }}/git/db/ target/ - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + key: ${{ runner.os }}-cargo-release-${{ hashFiles('**/Cargo.lock') }} restore-keys: | - ${{ runner.os }}-cargo- + ${{ runner.os }}-cargo-release- - name: Build Release Binary for Smoke Tests run: |