Skip to content

Commit 82c3dc3

Browse files
committed
build: cache remove date prefix.
Signed-off-by: Eliminater74 <eliminater74@gmail.com>
1 parent c4724b3 commit 82c3dc3

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

.github/workflows/build-openwrt.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ jobs:
384384
- name: Cache Key Get/Check
385385
working-directory: '/workdir/openwrt'
386386
run: |
387+
cd "$GITHUB_WORKSPACE"/openwrt
387388
chmod +x "$GITHUB_WORKSPACE"/scripts/$FUNCTIONS_SH
388389
source "$GITHUB_WORKSPACE"/scripts/$FUNCTIONS_SH
389390
CACHE_DEPENDENCY
@@ -408,7 +409,7 @@ jobs:
408409
path: |
409410
${{ github.workspace }}/openwrt/feeds/packages
410411
${{ github.workspace }}/openwrt/feeds/luci
411-
key: ${{ env.CACHE_NAME }}-${{ runner.os }}-${{ steps.date.outputs.date }}
412+
key: ${{ env.CACHE_NAME }}-${{ runner.os }}
412413
### ----------------------------------------------------------------- ###
413414
- name: 'Restore build Directory from cache'
414415
id: build-cache
@@ -418,7 +419,7 @@ jobs:
418419
CACHE_NAME: 'build-cache'
419420
with:
420421
path: ${{ github.workspace }}/openwrt/build_dir
421-
key: ${{ env.CACHE_NAME }}-${{ runner.os }}-${{ steps.date.outputs.date }}
422+
key: ${{ env.CACHE_NAME }}-${{ runner.os }}
422423
### ----------------------------------------------------------------- ###
423424
- name: 'Restore staging Directory from cache'
424425
id: staging-cache
@@ -428,7 +429,7 @@ jobs:
428429
CACHE_NAME: 'staging-cache'
429430
with:
430431
path: ${{ github.workspace }}/openwrt/staging_dir
431-
key: ${{ env.CACHE_NAME }}-${{ runner.os }}-${{ steps.date.outputs.date }}
432+
key: ${{ env.CACHE_NAME }}-${{ runner.os }}
432433
### ----------------------------------------------------------------- ###
433434
- name: 'Restore package Directory from cache'
434435
id: package-cache
@@ -438,7 +439,7 @@ jobs:
438439
CACHE_NAME: 'package-cache'
439440
with:
440441
path: ${{ github.workspace }}/openwrt/package
441-
key: ${{ env.CACHE_NAME }}-${{ runner.os }}-${{ steps.date.outputs.date }}
442+
key: ${{ env.CACHE_NAME }}-${{ runner.os }}
442443
### ----------------------------------------------------------------- ###
443444
- name: 'Restore downloads Directory from cache'
444445
id: dl-cache
@@ -448,7 +449,7 @@ jobs:
448449
CACHE_NAME: 'dl-cache'
449450
with:
450451
path: ${{ github.workspace }}/openwrt/dl
451-
key: ${{ env.CACHE_NAME }}-${{ runner.os }}-${{ steps.date.outputs.date }}
452+
key: ${{ env.CACHE_NAME }}-${{ runner.os }}
452453
### ----------------------------------------------------------------- ###
453454
- name: 'Restore build_dir/toolchain Directory from cache'
454455
id: build_dir_toolchain-cache
@@ -458,7 +459,7 @@ jobs:
458459
CACHE_NAME: 'build_dir_toolchain-cache'
459460
with:
460461
path: ${{ github.workspace }}/openwrt/build_dir/toolchain-*
461-
key: ${{ env.CACHE_NAME }}-${{ runner.os }}-${{ steps.date.outputs.date }}
462+
key: ${{ env.CACHE_NAME }}-${{ runner.os }}
462463
### ----------------------------------------------------------------- ###
463464
- name: 'Restore build_dir/target Directory from cache'
464465
id: build_dir_target-cache
@@ -468,7 +469,7 @@ jobs:
468469
CACHE_NAME: 'build_dir_target-cache'
469470
with:
470471
path: ${{ github.workspace }}/openwrt/build_dir/target-*
471-
key: ${{ env.CACHE_NAME }}-${{ runner.os }}-${{ steps.date.outputs.date }}
472+
key: ${{ env.CACHE_NAME }}-${{ runner.os }}
472473
### ----------------------------------------------------------------- ###
473474
- name: 'Restore build_dir/host Directory from cache'
474475
id: build_dir_host-cache
@@ -478,7 +479,7 @@ jobs:
478479
CACHE_NAME: 'build_dir_host-cache'
479480
with:
480481
path: ${{ github.workspace }}/openwrt/build_dir/host
481-
key: ${{ env.CACHE_NAME }}-${{ runner.os }}-${{ steps.date.outputs.date }}
482+
key: ${{ env.CACHE_NAME }}-${{ runner.os }}
482483
### ----------------------------------------------------------------- ###
483484
- name: 'Restore build_dir/hostpkg Directory from cache'
484485
id: build_dir_hostpkg-cache
@@ -488,7 +489,7 @@ jobs:
488489
CACHE_NAME: 'build_dir_hostpkg-cache'
489490
with:
490491
path: ${{ github.workspace }}/openwrt/build_dir/hostpkg
491-
key: ${{ env.CACHE_NAME }}-${{ runner.os }}-${{ steps.date.outputs.date }}
492+
key: ${{ env.CACHE_NAME }}-${{ runner.os }}
492493
### ----------------------------------------------------------------- ###
493494
- name: 'Restore .ccache from cache'
494495
id: ccache-cache
@@ -498,7 +499,7 @@ jobs:
498499
CACHE_NAME: 'ccache-cache'
499500
with:
500501
path: ${{ github.workspace }}/openwrt/.ccache
501-
key: ${{ env.CACHE_NAME }}-${{ runner.os }}-${{ steps.date.outputs.date }}
502+
key: ${{ env.CACHE_NAME }}-${{ runner.os }}
502503
### ----------------------------------------------------------------- ###
503504
- name: Setup cache for OpenWRT (ccache)
504505
id: ccache

0 commit comments

Comments
 (0)