Skip to content

Commit 924547f

Browse files
committed
wip
1 parent 69cb7b7 commit 924547f

File tree

2 files changed

+21
-22
lines changed

2 files changed

+21
-22
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencies {
4242
aggregateCoverage(project(":ui-tests"))
4343
}
4444

45-
tasks.register("runIde") {
45+
tasks.register<DefaultTask>("runIde") {
4646
doFirst {
4747
throw GradleException("Use project specific runIde command, i.e. :plugin-toolkit:intellij-standalone:runIde")
4848
}

settings.gradle.kts

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ pluginManagement {
4040
}
4141

4242
plugins {
43-
// https://github.com/burrunan/gradle-s3-build-cache/issues/118
44-
// id("com.github.burrunan.s3-build-cache") version "1.5"
43+
id("com.github.burrunan.s3-build-cache") version "1.9.3"
4544
id("com.gradle.develocity") version "3.17.6"
4645
id("org.jetbrains.intellij.platform.settings") version "2.7.1"
4746
}
@@ -73,25 +72,25 @@ buildscript {
7372
}
7473
}
7574

76-
//val regionEnv: Provider<String> = providers.environmentVariable("AWS_REGION")
77-
//val bucketEnv: Provider<String> = providers.environmentVariable("S3_BUILD_CACHE_BUCKET")
78-
//val prefixEnv: Provider<String> = providers.environmentVariable("S3_BUILD_CACHE_PREFIX")
79-
//if (regionEnv.isPresent && bucketEnv.isPresent && prefixEnv.isPresent) {
80-
// // TODO: can we serve a remote cache out of CloudFront instead? https://docs.gradle.org/8.1/userguide/build_cache.html#sec:build_cache_configure_remote
81-
// buildCache {
82-
// local {
83-
// isEnabled = false
84-
// }
85-
//
86-
// remote<com.github.burrunan.s3cache.AwsS3BuildCache> {
87-
// region = regionEnv.get()
88-
// bucket = bucketEnv.get()
89-
// prefix = prefixEnv.get()
90-
// isPush = true
91-
// lookupDefaultAwsCredentials = true
92-
// }
93-
// }
94-
//}
75+
val regionEnv: Provider<String> = providers.environmentVariable("AWS_REGION")
76+
val bucketEnv: Provider<String> = providers.environmentVariable("S3_BUILD_CACHE_BUCKET")
77+
val prefixEnv: Provider<String> = providers.environmentVariable("S3_BUILD_CACHE_PREFIX")
78+
if (regionEnv.isPresent && bucketEnv.isPresent && prefixEnv.isPresent) {
79+
// TODO: can we serve a remote cache out of CloudFront instead? https://docs.gradle.org/8.1/userguide/build_cache.html#sec:build_cache_configure_remote
80+
buildCache {
81+
local {
82+
isEnabled = false
83+
}
84+
85+
remote<com.github.burrunan.s3cache.AwsS3BuildCache> {
86+
region = regionEnv.get()
87+
bucket = bucketEnv.get()
88+
prefix = prefixEnv.get()
89+
isPush = true
90+
lookupDefaultAwsCredentials = true
91+
}
92+
}
93+
}
9594

9695
develocity {
9796
buildScan {

0 commit comments

Comments
 (0)