Skip to content

Commit 821cc3d

Browse files
committed
Merge branch 'CacheVersionUpdateTo3' of https://github.com/e-korolevskii/setup-java into CacheVersionUpdateTo3
2 parents 4903eaf + a050066 commit 821cc3d

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ inputs:
5454
$GPG_PASSPHRASE.'
5555
required: false
5656
cache:
57-
description: 'Name of the build platform to cache dependencies. It can be "maven" or "gradle".'
57+
description: 'Name of the build platform to cache dependencies. It can be "maven", "gradle" or "sbt".'
5858
required: false
5959
job-status:
6060
description: 'Workaround to pass job status to post job step. This variable is not intended for manual setting'

dist/cleanup/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66179,7 +66179,11 @@ const supportedPackageManager = [
6617966179
path: [
6618066180
path_1.join(os_1.default.homedir(), '.ivy2', 'cache'),
6618166181
path_1.join(os_1.default.homedir(), '.sbt'),
66182-
getCoursierCachePath()
66182+
getCoursierCachePath(),
66183+
// Some files should not be cached to avoid resolution problems.
66184+
// In particular the resolution of snapshots (ideological gap between maven/ivy).
66185+
'!' + path_1.join(os_1.default.homedir(), '.sbt', '*.lock'),
66186+
'!' + path_1.join(os_1.default.homedir(), '**', 'ivydata-*.properties')
6618366187
],
6618466188
pattern: ['**/*.sbt', '**/project/build.properties', '**/project/**.{scala,sbt}']
6618566189
}

dist/setup/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101384,7 +101384,11 @@ const supportedPackageManager = [
101384101384
path: [
101385101385
path_1.join(os_1.default.homedir(), '.ivy2', 'cache'),
101386101386
path_1.join(os_1.default.homedir(), '.sbt'),
101387-
getCoursierCachePath()
101387+
getCoursierCachePath(),
101388+
// Some files should not be cached to avoid resolution problems.
101389+
// In particular the resolution of snapshots (ideological gap between maven/ivy).
101390+
'!' + path_1.join(os_1.default.homedir(), '.sbt', '*.lock'),
101391+
'!' + path_1.join(os_1.default.homedir(), '**', 'ivydata-*.properties')
101388101392
],
101389101393
pattern: ['**/*.sbt', '**/project/build.properties', '**/project/**.{scala,sbt}']
101390101394
}

src/cache.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ const supportedPackageManager: PackageManager[] = [
3838
path: [
3939
join(os.homedir(), '.ivy2', 'cache'),
4040
join(os.homedir(), '.sbt'),
41-
getCoursierCachePath()
41+
getCoursierCachePath(),
42+
// Some files should not be cached to avoid resolution problems.
43+
// In particular the resolution of snapshots (ideological gap between maven/ivy).
44+
'!' + join(os.homedir(), '.sbt', '*.lock'),
45+
'!' + join(os.homedir(), '**', 'ivydata-*.properties')
4246
],
4347
pattern: ['**/*.sbt', '**/project/build.properties', '**/project/**.{scala,sbt}']
4448
}

0 commit comments

Comments
 (0)