diff options
| author | Garrett Cox <garrettjcox@gmail.com> | 2025-11-22 13:05:32 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-22 13:05:32 -0600 |
| commit | 259408d62d3ee78d70cd879622ff89abdcd48c28 (patch) | |
| tree | e0b4e3993e73bfbc1ef2ad4a297e0af77740a974 /.github/workflows | |
| parent | 749f7172e5fb6f8800fda7f2f3dd306386795761 (diff) | |
Revert "Tweaks to github actions cache (#1359)" (#1362)
This reverts commit a42551063d2723764e3b595f679bb83852101002.
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/main.yml | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0d198d3f5..7b67de5a2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,9 +18,9 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: save: ${{ github.ref_name == github.event.repository.default_branch }} - key: ${{ runner.os }}-otr-ccache-${{ github.ref_name }} + key: ${{ runner.os }}-otr-ccache-${{ github.ref }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-otr-ccache-${{ github.event.repository.default_branch }} + ${{ runner.os }}-otr-ccache-${{ github.ref }} ${{ runner.os }}-otr-ccache - name: Install dependencies run: | @@ -29,9 +29,9 @@ jobs: - name: Restore Cached deps folder uses: actions/cache/restore@v4 with: - key: ${{ runner.os }}-deps-${{ github.ref_name }} + key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-deps-${{ github.event.repository.default_branch }} + ${{ runner.os }}-deps-${{ github.ref }}- ${{ runner.os }}-deps- path: deps - name: Create deps folder @@ -87,9 +87,9 @@ jobs: with: create-symlink: true save: ${{ github.ref_name == github.event.repository.default_branch }} - key: ${{ runner.os }}-14-ccache-${{ github.ref_name }} + key: ${{ runner.os }}-14-ccache-${{ github.ref }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-14-ccache-${{ github.event.repository.default_branch }} + ${{ runner.os }}-14-ccache-${{ github.ref }} ${{ runner.os }}-14-ccache # Needed to apply sudo for macports cache restore - name: Install gtar wrapper @@ -101,7 +101,10 @@ jobs: id: restore-cache-macports uses: actions/cache/restore@v4 with: - key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }} + key: ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-14-macports-${{ hashFiles('.github/workflows/macports-deps.txt') }}- + ${{ runner.os }}-14-macports- path: /opt/local/ # Updated PATH applies to the next step and onwards - name: Install MacPorts (if necessary) @@ -163,17 +166,17 @@ jobs: uses: hendrikmuhs/ccache-action@v1.2 with: save: ${{ github.ref_name == github.event.repository.default_branch }} - key: ${{ runner.os }}-ccache-${{ github.ref_name }} + key: ${{ runner.os }}-ccache-${{ github.ref }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-ccache-${{ github.event.repository.default_branch }} + ${{ runner.os }}-ccache-${{ github.ref }} ${{ runner.os }}-ccache - name: Restore Cached deps folder id: restore-cache-deps uses: actions/cache/restore@v4 with: - key: ${{ runner.os }}-deps-${{ github.ref_name }} + key: ${{ runner.os }}-deps-${{ github.ref }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-deps-${{ github.event.repository.default_branch }} + ${{ runner.os }}-deps-${{ github.ref }}- ${{ runner.os }}-deps- path: deps - name: Create deps folder @@ -268,17 +271,17 @@ jobs: max-size: "2G" evict-old-files: job save: ${{ github.ref_name == github.event.repository.default_branch }} - key: ${{ runner.os }}-ccache-${{ github.ref_name }} + key: ${{ runner.os }}-ccache-${{ github.ref }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-ccache-${{ github.event.repository.default_branch }} + ${{ runner.os }}-ccache-${{ github.ref }} ${{ runner.os }}-ccache - name: Restore Cached VCPKG folder id: restore-cache-vcpkg uses: actions/cache/restore@v4 with: - key: ${{ runner.os }}-vcpkg-${{ github.ref_name }} + key: ${{ runner.os }}-vcpkg-${{ github.ref }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-vcpkg-${{ github.event.repository.default_branch }} + ${{ runner.os }}-vcpkg-${{ github.ref }}- ${{ runner.os }}-vcpkg- path: vcpkg - name: Configure Developer Command Prompt |