Skip to content

Commit b9a618f

Browse files
tylerbertrandyrodiere
authored andcommitted
Switch to the Commonhaus Develocity instance
1 parent 1e03409 commit b9a618f

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

.github/workflows/build.yml

+2
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,12 @@ jobs:
6363
-Pjqassistant -Pdist -Pci-build -DskipITs
6464
env:
6565
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
66+
DEVELOCITY_BASE_URL: "${{ env.DEVELOCITY_BASE_URL || 'https://develocity.commonhaus.dev' }}"
6667
- name: Running integration tests in the default environment
6768
run: |
6869
./mvnw $MAVEN_ARGS ${{ matrix.os.maven.args }} clean verify \
6970
-Pskip-checks \
7071
${{ github.event.pull_request.base.ref && format('-Dincremental -Dgib.referenceBranch=refs/remotes/origin/{0}', github.event.pull_request.base.ref) || '' }}
7172
env:
7273
DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
74+
DEVELOCITY_BASE_URL: "${{ env.DEVELOCITY_BASE_URL || 'https://develocity.commonhaus.dev' }}"

.mvn/develocity.xml

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns="https://www.gradle.com/develocity-maven" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:schemaLocation="https://www.gradle.com/develocity-maven https://www.gradle.com/schema/develocity-maven.xsd">
44
<server>
5-
<url>https://ge.hibernate.org</url>
5+
<url>#{env['DEVELOCITY_BASE_URL']?:'https://develocity.commonhaus.dev'}</url>
66
<allowUntrusted>false</allowUntrusted>
77
</server>
88
<buildScan>
@@ -38,9 +38,6 @@
3838
<remote>
3939
<enabled>#{properties['no-build-cache'] == null}</enabled>
4040
<storeEnabled>#{env['CI'] != null and (env['CHANGE_ID']?:'').isBlank() and (env['GITHUB_BASE_REF']?:'').isBlank() and !(env['GRADLE_ENTERPRISE_ACCESS_KEY']?:'').isBlank()}</storeEnabled>
41-
<server>
42-
<url>https://ge.hibernate.org/cache/hsearchtest01/</url>
43-
</server>
4441
</remote>
4542
</buildCache>
4643
</develocity>

Jenkinsfile

+10-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ def withMavenWorkspace(Closure body) {
77
artifactsPublisher(disabled: true),
88
junitPublisher(disabled: true)
99
]) {
10-
withCredentials([string(credentialsId: 'ge.hibernate.org-access-key',
11-
variable: 'DEVELOCITY_ACCESS_KEY')]) {
12-
withGradle { // withDevelocity, actually: https://plugins.jenkins.io/gradle/#plugin-content-capturing-build-scans-from-jenkins-pipeline
13-
body()
14-
}
15-
}
10+
def develocityMainCredentialsId = helper.configuration.file?.develocity?.credentials?.main
11+
def develocityBaseUrl = helper.configuration.file?.develocity?.url
12+
withEnv(["DEVELOCITY_BASE_URL=${develocityBaseUrl}"]) {
13+
withCredentials([string(credentialsId: develocityMainCredentialsId,
14+
variable: 'DEVELOCITY_ACCESS_KEY')]) {
15+
withGradle { // withDevelocity, actually: https://plugins.jenkins.io/gradle/#plugin-content-capturing-build-scans-from-jenkins-pipeline
16+
body()
17+
}
18+
}
19+
}
1620
}
1721
}
1822

0 commit comments

Comments
 (0)