Skip to content

Commit 0a1e1a9

Browse files
authored
fix(ci): fix ccache cache key (#4977)
1 parent 2a00215 commit 0a1e1a9

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.github/actions/docker-build-and-push/action.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ runs:
4444
- name: Setup Docker Buildx
4545
uses: docker/setup-buildx-action@v3
4646

47+
# TODO(youtalk): Remove obsolete "cache-" restore-keys
4748
- name: Restore ccache
4849
uses: actions/cache/restore@v4
4950
with:
@@ -53,8 +54,8 @@ runs:
5354
restore-keys: |
5455
ccache-${{ inputs.platform }}-${{ inputs.name }}-
5556
ccache-${{ inputs.platform }}-
56-
cache-${{ inputs.platform }}-${{ inputs.name }}- # TODO(youtalk): Remove obsolete cache key
57-
cache-${{ inputs.platform }}- # TODO(youtalk): Remove obsolete cache key
57+
cache-${{ inputs.platform }}-${{ inputs.name }}-
58+
cache-${{ inputs.platform }}-
5859
5960
- name: Restore apt-get
6061
uses: actions/cache/restore@v4

.github/actions/docker-build/action.yaml

+7-5
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,20 @@ runs:
3434
vcs import src < autoware.repos
3535
shell: bash
3636

37+
# TODO(youtalk): Remove obsolete "cache-" restore-keys
3738
- name: Cache ccache
3839
uses: actions/cache@v4
3940
if: ${{ inputs.name == 'no-cuda' }}
4041
id: cache-ccahce
4142
with:
4243
path: |
4344
root-ccache
44-
key: cache-${{ inputs.platform }}-${{ inputs.name }}-${{ hashFiles('src/**/*.cpp') }}
45+
key: ccache-${{ inputs.platform }}-${{ inputs.name }}-${{ hashFiles('src/**/*.cpp') }}
4546
restore-keys: |
4647
ccache-${{ inputs.platform }}-${{ inputs.name }}-
4748
ccache-${{ inputs.platform }}-
48-
cache-${{ inputs.platform }}-${{ inputs.name }}- # TODO(youtalk): Remove obsolete cache key
49-
cache-${{ inputs.platform }}- # TODO(youtalk): Remove obsolete cache key
49+
cache-${{ inputs.platform }}-${{ inputs.name }}-
50+
cache-${{ inputs.platform }}-
5051
5152
- name: Cache apt-get
5253
uses: actions/cache@v4
@@ -61,6 +62,7 @@ runs:
6162
apt-get-${{ inputs.platform }}-${{ inputs.name }}-
6263
apt-get-${{ inputs.platform }}-
6364
65+
# TODO(youtalk): Remove obsolete "cache-" restore-keys
6466
- name: Restore ccache
6567
uses: actions/cache/restore@v4
6668
if: ${{ inputs.name != 'no-cuda' }}
@@ -71,8 +73,8 @@ runs:
7173
restore-keys: |
7274
ccache-${{ inputs.platform }}-${{ inputs.name }}-
7375
ccache-${{ inputs.platform }}-
74-
cache-${{ inputs.platform }}-${{ inputs.name }}- # TODO(youtalk): Remove obsolete cache key
75-
cache-${{ inputs.platform }}- # TODO(youtalk): Remove obsolete cache key
76+
cache-${{ inputs.platform }}-${{ inputs.name }}-
77+
cache-${{ inputs.platform }}-
7678
7779
- name: Restore apt-get
7880
uses: actions/cache/restore@v4

0 commit comments

Comments
 (0)