Skip to content

Commit b2872d1

Browse files
AnbeeldAnbeeld
committed
fix(ci): align ccache-action restore keys with save-rolling-ccache keys
The ccache-action restore used key prefix 'release-' but save-rolling-ccache saved under 'ccache-release-'. On every run the restore would never find the saved cache, causing full recompilation. Prefix all restore keys and restore-keys with 'ccache-release-' to match the save key format.
1 parent 68428ee commit b2872d1

1 file changed

Lines changed: 33 additions & 33 deletions

File tree

‎.github/workflows/release.yml‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -210,10 +210,10 @@ jobs:
210210
- name: ccache
211211
uses: ggml-org/ccache-action@v1.2.21
212212
with:
213-
key: release-${{ needs.release-meta.outputs.ccache_ref }}-macos-arm64
213+
key: ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-macos-arm64
214214
restore-keys: |
215-
release-${{ needs.release-meta.outputs.ccache_ref }}-macos-arm64-
216-
release-macos-arm64-
215+
ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-macos-arm64-
216+
ccache-release-macos-arm64-
217217
append-timestamp: false
218218
save: false
219219
evict-old-files: 1d
@@ -290,10 +290,10 @@ jobs:
290290
- name: ccache
291291
uses: ggml-org/ccache-action@v1.2.21
292292
with:
293-
key: release-${{ needs.release-meta.outputs.ccache_ref }}-${{ matrix.os }}-cpu
293+
key: ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-${{ matrix.os }}-cpu
294294
restore-keys: |
295-
release-${{ needs.release-meta.outputs.ccache_ref }}-${{ matrix.os }}-cpu-
296-
release-${{ matrix.os }}-cpu-
295+
ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-${{ matrix.os }}-cpu-
296+
ccache-release-${{ matrix.os }}-cpu-
297297
append-timestamp: false
298298
save: false
299299
evict-old-files: 1d
@@ -375,10 +375,10 @@ jobs:
375375
- name: ccache
376376
uses: ggml-org/ccache-action@v1.2.21
377377
with:
378-
key: release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-vulkan-x64
378+
key: ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-vulkan-x64
379379
restore-keys: |
380-
release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-vulkan-x64-
381-
release-ubuntu-vulkan-x64-
380+
ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-vulkan-x64-
381+
ccache-release-ubuntu-vulkan-x64-
382382
append-timestamp: false
383383
save: false
384384
evict-old-files: 1d
@@ -463,10 +463,10 @@ jobs:
463463
- name: ccache
464464
uses: ggml-org/ccache-action@v1.2.21
465465
with:
466-
key: release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-rocm-${{ env.ROCM_VERSION }}-x64
466+
key: ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-rocm-${{ env.ROCM_VERSION }}-x64
467467
restore-keys: |
468-
release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-rocm-${{ env.ROCM_VERSION }}-x64-
469-
release-ubuntu-rocm-${{ env.ROCM_VERSION }}-x64-
468+
ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-rocm-${{ env.ROCM_VERSION }}-x64-
469+
ccache-release-ubuntu-rocm-${{ env.ROCM_VERSION }}-x64-
470470
append-timestamp: false
471471
save: false
472472
evict-old-files: 1d
@@ -580,10 +580,10 @@ jobs:
580580
- name: ccache
581581
uses: ggml-org/ccache-action@v1.2.21
582582
with:
583-
key: release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64
583+
key: ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64
584584
restore-keys: |
585-
release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64-
586-
release-ubuntu-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64-
585+
ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64-
586+
ccache-release-ubuntu-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64-
587587
append-timestamp: false
588588
save: false
589589
evict-old-files: 1d
@@ -697,10 +697,10 @@ jobs:
697697
- name: ccache
698698
uses: ggml-org/ccache-action@v1.2.21
699699
with:
700-
key: release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-cuda-${{ matrix.cuda }}-x64
700+
key: ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-cuda-${{ matrix.cuda }}-x64
701701
restore-keys: |
702-
release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-cuda-${{ matrix.cuda }}-x64-
703-
release-ubuntu-cuda-${{ matrix.cuda }}-x64-
702+
ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-ubuntu-cuda-${{ matrix.cuda }}-x64-
703+
ccache-release-ubuntu-cuda-${{ matrix.cuda }}-x64-
704704
append-timestamp: false
705705
save: false
706706
evict-old-files: 1d
@@ -774,10 +774,10 @@ jobs:
774774
- name: ccache
775775
uses: ggml-org/ccache-action@v1.2.21
776776
with:
777-
key: release-${{ needs.release-meta.outputs.ccache_ref }}-windows-cpu-x64
777+
key: ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-windows-cpu-x64
778778
restore-keys: |
779-
release-${{ needs.release-meta.outputs.ccache_ref }}-windows-cpu-x64-
780-
release-windows-cpu-x64-
779+
ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-windows-cpu-x64-
780+
ccache-release-windows-cpu-x64-
781781
append-timestamp: false
782782
save: false
783783
variant: ccache
@@ -878,10 +878,10 @@ jobs:
878878
- name: ccache
879879
uses: ggml-org/ccache-action@v1.2.21
880880
with:
881-
key: release-${{ needs.release-meta.outputs.ccache_ref }}-windows-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64
881+
key: ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-windows-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64
882882
restore-keys: |
883-
release-${{ needs.release-meta.outputs.ccache_ref }}-windows-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64-
884-
release-windows-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64-
883+
ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-windows-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64-
884+
ccache-release-windows-sycl-${{ env.ONEAPI_INSTALLER_VERSION }}-x64-
885885
append-timestamp: false
886886
save: false
887887
variant: ccache
@@ -1006,10 +1006,10 @@ jobs:
10061006
- name: ccache
10071007
uses: ggml-org/ccache-action@v1.2.21
10081008
with:
1009-
key: release-${{ needs.release-meta.outputs.ccache_ref }}-windows-vulkan-${{ env.VULKAN_VERSION }}-x64
1009+
key: ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-windows-vulkan-${{ env.VULKAN_VERSION }}-x64
10101010
restore-keys: |
1011-
release-${{ needs.release-meta.outputs.ccache_ref }}-windows-vulkan-${{ env.VULKAN_VERSION }}-x64-
1012-
release-windows-vulkan-${{ env.VULKAN_VERSION }}-x64-
1011+
ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-windows-vulkan-${{ env.VULKAN_VERSION }}-x64-
1012+
ccache-release-windows-vulkan-${{ env.VULKAN_VERSION }}-x64-
10131013
append-timestamp: false
10141014
save: false
10151015
variant: ccache
@@ -1081,10 +1081,10 @@ jobs:
10811081
- name: Install ccache
10821082
uses: ggml-org/ccache-action@v1.2.21
10831083
with:
1084-
key: release-${{ needs.release-meta.outputs.ccache_ref }}-windows-cuda-${{ matrix.cuda }}
1084+
key: ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-windows-cuda-${{ matrix.cuda }}
10851085
restore-keys: |
1086-
release-${{ needs.release-meta.outputs.ccache_ref }}-windows-cuda-${{ matrix.cuda }}-
1087-
release-windows-cuda-${{ matrix.cuda }}-
1086+
ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-windows-cuda-${{ matrix.cuda }}-
1087+
ccache-release-windows-cuda-${{ matrix.cuda }}-
10881088
append-timestamp: false
10891089
save: false
10901090
variant: ccache
@@ -1208,10 +1208,10 @@ jobs:
12081208
- name: ccache
12091209
uses: ggml-org/ccache-action@v1.2.21
12101210
with:
1211-
key: release-${{ needs.release-meta.outputs.ccache_ref }}-windows-hip-${{ env.HIPSDK_INSTALLER_VERSION }}-x64
1211+
key: ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-windows-hip-${{ env.HIPSDK_INSTALLER_VERSION }}-x64
12121212
restore-keys: |
1213-
release-${{ needs.release-meta.outputs.ccache_ref }}-windows-hip-${{ env.HIPSDK_INSTALLER_VERSION }}-x64-
1214-
release-windows-hip-${{ env.HIPSDK_INSTALLER_VERSION }}-x64-
1213+
ccache-release-${{ needs.release-meta.outputs.ccache_ref }}-windows-hip-${{ env.HIPSDK_INSTALLER_VERSION }}-x64-
1214+
ccache-release-windows-hip-${{ env.HIPSDK_INSTALLER_VERSION }}-x64-
12151215
append-timestamp: false
12161216
save: false
12171217
evict-old-files: 1d

0 commit comments

Comments
 (0)