Skip to content

Commit e2e85a2

Browse files
committed
remove usage of cache-key-prefix
1 parent 0684cf0 commit e2e85a2

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

.github/actions/common/action.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@ inputs:
5454
setup-latest-java:
5555
description: Setup latest stable java version
5656
default: 'false'
57-
cache-key-prefix:
58-
description: Add a prefix to cache key
59-
default: ''
6057
runs:
6158
using: "composite"
6259
steps:
@@ -116,9 +113,9 @@ runs:
116113
!.m2/repository/io/helidon/**
117114
enableCrossOsArchive: true
118115
# only hash top-level poms to keep it fast
119-
key: ${{ inputs.cache-key-prefix }}local-maven-${{ hashFiles('*/pom.xml', 'pom.xml') }}
116+
key: local-maven-${{ github.run_id }}-${{ hashFiles('*/pom.xml', 'pom.xml') }}
120117
restore-keys: |
121-
${{ inputs.cache-key-prefix }}local-maven-
118+
local-maven-${{ github.run_id }}
122119
- name: Cache local Maven repository (read-only)
123120
if: ${{ inputs.maven-cache == 'read-only' }}
124121
uses: actions/cache/[email protected]
@@ -127,9 +124,9 @@ runs:
127124
.m2/repository/**/*.*
128125
!.m2/repository/io/helidon/**
129126
enableCrossOsArchive: true
130-
key: ${{ inputs.cache-key-prefix }}local-maven-${{ hashFiles('*/pom.xml', 'pom.xml') }}
127+
key: local-maven-${{ github.run_id }}-${{ hashFiles('*/pom.xml', 'pom.xml') }}
131128
restore-keys: |
132-
${{ inputs.cache-key-prefix }}local-maven-
129+
local-maven-${{ github.run_id }}
133130
- name: Build cache (read-write)
134131
if: ${{ inputs.build-cache == 'read-write' }}
135132
uses: actions/[email protected]
@@ -138,7 +135,7 @@ runs:
138135
./**/target/**
139136
.m2/repository/io/helidon/**
140137
enableCrossOsArchive: true
141-
key: ${{ inputs.cache-key-prefix }}build-cache-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.build-cache-id }}
138+
key: build-cache-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.build-cache-id }}
142139
restore-keys: |
143140
build-cache-${{ github.run_id }}-${{ github.run_attempt }}-
144141
build-cache-${{ github.run_id }}-
@@ -151,10 +148,10 @@ runs:
151148
.m2/repository/io/helidon/**
152149
enableCrossOsArchive: true
153150
fail-on-cache-miss: true
154-
key: ${{ inputs.cache-key-prefix }}build-cache-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.build-cache-id }}
151+
key: build-cache-${{ github.run_id }}-${{ github.run_attempt }}-${{ inputs.build-cache-id }}
155152
restore-keys: |
156-
${{ inputs.cache-key-prefix }}build-cache-${{ github.run_id }}-${{ github.run_attempt }}-
157-
${{ inputs.cache-key-prefix }}build-cache-${{ github.run_id }}-
153+
build-cache-${{ github.run_id }}-${{ github.run_attempt }}-
154+
build-cache-${{ github.run_id }}-
158155
- name: Exec
159156
env:
160157
MVN_ARGS: |

.github/workflows/nightly.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ jobs:
3939
with:
4040
build-cache: read-write
4141
maven-cache: read-write
42-
cache-key-prefix: latest-java-
4342
setup-latest-java: true
4443
run: |
4544
mvn ${MVN_ARGS} --version
@@ -68,7 +67,6 @@ jobs:
6867
- uses: ./.github/actions/common
6968
with:
7069
build-cache: read-only
71-
cache-key-prefix: latest-java-
7270
setup-latest-java: true
7371
test-artifact-name: tests-${{ matrix.moduleSet }}-${{ matrix.platform }}-latest-java
7472
run: |

0 commit comments

Comments
 (0)