Skip to content

Commit ff735e3

Browse files
committed
Caching polish. Rm explicit exec, set remote cache credentials
1 parent fe9a87d commit ff735e3

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323
uses: openrewrite/gh-automation/.github/workflows/ci-gradle.yml@main
2424
secrets:
2525
gradle_enterprise_access_key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
26+
gradle_enterprise_cache_username: ${{ secrets.GRADLE_ENTERPRISE_CACHE_USERNAME }}
27+
gradle_enterprise_cache_password: ${{ secrets.GRADLE_ENTERPRISE_CACHE_PASSWORD }}
2628
ossrh_username: ${{ secrets.OSSRH_USERNAME }}
2729
ossrh_token: ${{ secrets.OSSRH_TOKEN }}
2830
ossrh_signing_key: ${{ secrets.OSSRH_SIGNING_KEY }}

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,6 @@ tasks.named<JavaCompile>("compileJava") {
180180
targetCompatibility = JavaVersion.VERSION_1_8.toString()
181181

182182
options.isFork = true
183-
options.forkOptions.executable = "javac"
184183
options.compilerArgs.addAll(listOf("--release", "8"))
185184
}
186185

gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
#
1+
org.gradle.caching=true
2+
org.gradle.parallel=true

settings.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,19 @@ plugins {
88
gradleEnterprise {
99
val isCiServer = System.getenv("CI")?.equals("true") ?: false
1010
server = "https://ge.openrewrite.org/"
11+
val gradleCacheRemoteUsername: String? = System.getenv("GRADLE_ENTERPRISE_CACHE_USERNAME")
12+
val gradleCacheRemotePassword: String? = System.getenv("GRADLE_ENTERPRISE_CACHE_PASSWORD")
1113

1214
buildCache {
1315
remote(HttpBuildCache::class) {
1416
url = uri("https://ge.openrewrite.org/cache/")
1517
isPush = isCiServer
18+
if (!gradleCacheRemoteUsername.isNullOrBlank() && !gradleCacheRemotePassword.isNullOrBlank()) {
19+
credentials {
20+
username = gradleCacheRemoteUsername
21+
password = gradleCacheRemotePassword
22+
}
23+
}
1624
}
1725
}
1826

0 commit comments

Comments
 (0)