Skip to content

Commit b4dddc0

Browse files
committed
use the new actions/cache@v3 instead of my own fork
1 parent 4480262 commit b4dddc0

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/actions/cache-query-compilation/action.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,19 @@ runs:
2323
run: |
2424
MERGE_BASE=$(git cat-file commit $GITHUB_SHA | grep '^parent ' | head -1 | cut -f 2 -d " ")
2525
echo "merge_base=$MERGE_BASE" >> $GITHUB_ENV
26-
- name: Restore read-only cache (PR)
26+
- name: Restore cache (PR)
2727
if: ${{ github.event_name == 'pull_request' }}
28-
uses: erik-krogh/actions-cache@a88d0603fe5fb5606db9f002dfcadeb32b5f84c6
28+
uses: actions/cache/restore@v3
2929
with:
3030
path: '**/.cache'
31-
read-only: true
3231
key: codeql-compile-${{ inputs.key }}-pr-${{ github.sha }}
3332
restore-keys: |
3433
codeql-compile-${{ inputs.key }}-${{ github.base_ref }}-${{ env.merge_base }}
3534
codeql-compile-${{ inputs.key }}-${{ github.base_ref }}-
3635
codeql-compile-${{ inputs.key }}-main-
37-
- name: Fill cache (push)
36+
- name: Fill cache (only branch push)
3837
if: ${{ github.event_name != 'pull_request' }}
39-
uses: erik-krogh/actions-cache@a88d0603fe5fb5606db9f002dfcadeb32b5f84c6
38+
uses: actions/cache@v3
4039
with:
4140
path: '**/.cache'
4241
key: codeql-compile-${{ inputs.key }}-${{ github.ref_name }}-${{ github.sha }} # just fill on main

swift/actions/build-and-test/action.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,17 @@ runs:
2121
echo "merge_base=$MERGE_BASE" >> $GITHUB_ENV
2222
- name: Restore read-only cache (PR)
2323
if: ${{ github.event_name == 'pull_request' }}
24-
uses: erik-krogh/actions-cache@a88d0603fe5fb5606db9f002dfcadeb32b5f84c6
24+
uses: actions/cache/restore@v3
2525
with:
2626
path: 'bazel-cache'
27-
read-only: true
2827
key: bazel-pr-${{ github.sha }}
2928
restore-keys: |
3029
bazel-${{ github.base_ref }}-${{ env.merge_base }}
3130
bazel-${{ github.base_ref }}-
3231
bazel-main-
3332
- name: Fill cache (push)
3433
if: ${{ github.event_name != 'pull_request' }}
35-
uses: erik-krogh/actions-cache@a88d0603fe5fb5606db9f002dfcadeb32b5f84c6
34+
uses: actions/cache@v3
3635
with:
3736
path: 'bazel-cache'
3837
key: bazel-${{ github.ref_name }}-${{ github.sha }} # just fill on main

0 commit comments

Comments
 (0)