File tree Expand file tree Collapse file tree 3 files changed +6
-9
lines changed Expand file tree Collapse file tree 3 files changed +6
-9
lines changed Original file line number Diff line number Diff line change @@ -61868,9 +61868,8 @@ function restore(id) {
61868
61868
if (primaryKey.endsWith('-')) {
61869
61869
throw new Error(`No file in ${process.cwd()} matched to [${packageManager.pattern}], make sure you have checked out the target repository`);
61870
61870
}
61871
- const matchedKey = yield cache.restoreCache(packageManager.path, primaryKey, [
61872
- `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${id}`
61873
- ]);
61871
+ // No "restoreKeys" is set, to start with a clear cache after dependency update (see https://github.com/actions/setup-java/issues/269)
61872
+ const matchedKey = yield cache.restoreCache(packageManager.path, primaryKey);
61874
61873
if (matchedKey) {
61875
61874
core.saveState(CACHE_MATCHED_KEY, matchedKey);
61876
61875
core.info(`Cache restored from key: ${matchedKey}`);
Original file line number Diff line number Diff line change @@ -18659,9 +18659,8 @@ function restore(id) {
18659
18659
if (primaryKey.endsWith('-')) {
18660
18660
throw new Error(`No file in ${process.cwd()} matched to [${packageManager.pattern}], make sure you have checked out the target repository`);
18661
18661
}
18662
- const matchedKey = yield cache.restoreCache(packageManager.path, primaryKey, [
18663
- `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${id}`
18664
- ]);
18662
+ // No "restoreKeys" is set, to start with a clear cache after dependency update (see https://github.com/actions/setup-java/issues/269)
18663
+ const matchedKey = yield cache.restoreCache(packageManager.path, primaryKey);
18665
18664
if (matchedKey) {
18666
18665
core.saveState(CACHE_MATCHED_KEY, matchedKey);
18667
18666
core.info(`Cache restored from key: ${matchedKey}`);
Original file line number Diff line number Diff line change @@ -72,9 +72,8 @@ export async function restore(id: string) {
72
72
) ;
73
73
}
74
74
75
- const matchedKey = await cache . restoreCache ( packageManager . path , primaryKey , [
76
- `${ CACHE_KEY_PREFIX } -${ process . env [ 'RUNNER_OS' ] } -${ id } `
77
- ] ) ;
75
+ // No "restoreKeys" is set, to start with a clear cache after dependency update (see https://github.com/actions/setup-java/issues/269)
76
+ const matchedKey = await cache . restoreCache ( packageManager . path , primaryKey ) ;
78
77
if ( matchedKey ) {
79
78
core . saveState ( CACHE_MATCHED_KEY , matchedKey ) ;
80
79
core . info ( `Cache restored from key: ${ matchedKey } ` ) ;
You can’t perform that action at this time.
0 commit comments