Skip to content

Commit 869e213

Browse files
committed
Update develocity config
1 parent efd9b6c commit 869e213

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ projectVersion=6.0.0-SNAPSHOT
33
asciidoctorJvmVersion=4.0.3
44
grailsVersion=7.0.0-SNAPSHOT
55

6+
customUserDataVersion=2.2.1
7+
develocityVersion=4.0
8+
69
#For tests only
710
hibernate5Version=5.6.15.Final
811
jbossTransactionApiVersion=2.0.0.Final

settings.gradle

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,26 @@
11
plugins {
2-
id 'com.gradle.develocity' version '3.18.1'
3-
id 'com.gradle.common-custom-user-data-gradle-plugin' version '2.0.2'
2+
id "com.gradle.develocity" version "$develocityVersion"
3+
id "com.gradle.common-custom-user-data-gradle-plugin" version "$customUserDataVersion"
44
}
55

6-
def isCI = System.getenv('CI') != null
6+
def isCI = System.getenv().containsKey('CI')
77
def isLocal = !isCI
8-
def isAuthenticated = System.getenv('DEVELOCITY_ACCESS_KEY') != null
9-
def isBuildCacheAuthenticated =
10-
System.getenv('DEVELOCITY_BUILD_CACHE_NODE_USER') != null &&
11-
System.getenv('DEVELOCITY_BUILD_CACHE_NODE_KEY') != null
128

139
develocity {
1410
server = 'https://ge.grails.org'
1511
buildScan {
16-
tag('grails-plugins')
17-
tag('grails-plugins/grails-audit-logging')
18-
publishing.onlyIf { isAuthenticated }
12+
tag('grails')
13+
tag('grails-forge')
14+
publishing.onlyIf { it.authenticated }
1915
uploadInBackground = isLocal
2016
}
2117
}
2218

2319
buildCache {
2420
local { enabled = isLocal }
2521
remote(develocity.buildCache) {
26-
push = isCI && isBuildCacheAuthenticated
22+
push = isCI
2723
enabled = true
28-
usernameAndPassword(
29-
System.getenv('DEVELOCITY_BUILD_CACHE_NODE_USER') ?: '',
30-
System.getenv('DEVELOCITY_BUILD_CACHE_NODE_KEY') ?: ''
31-
)
3224
}
3325
}
3426

0 commit comments

Comments
 (0)