Skip to content

Commit a9efe63

Browse files
authored
Migrate to the OSS Community Develocity Instance (#2381)
This PR moves Spock's Build Scan publishing and remote Build Cache from the self-hosted `ge.spockframework.org` instance to the **OSS Community Develocity Instance** at <https://community.develocity.cloud> under project ID `spockframework`.
1 parent 4d983c4 commit a9efe63

5 files changed

Lines changed: 9 additions & 8 deletions

File tree

.github/workflows/branches-and-prs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
- id: 'step-3'
128128
name: 'Build Spock'
129129
env:
130-
DEVELOCITY_ACCESS_KEY: '${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}'
130+
DEVELOCITY_ACCESS_KEY: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
131131
run: './gradlew --stacktrace ghActionsBuild "-Dvariant=${{ matrix.variant }}" "-DjavaVersion=${{ matrix.java }}"'
132132
- id: 'step-4'
133133
name: 'Upload to Codecov.io'

.github/workflows/common.main.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ import io.github.typesafegithub.workflows.yaml.CheckoutActionVersionSource.Infer
3232
import io.github.typesafegithub.workflows.yaml.DEFAULT_CONSISTENCY_CHECK_JOB_CONFIG
3333
import java.util.Properties
3434

35-
val GRADLE_ENTERPRISE_ACCESS_KEY by secrets
35+
val DEVELOCITY_ACCESS_KEY by secrets
3636

3737
val commonCredentials = mapOf(
38-
"DEVELOCITY_ACCESS_KEY" to expr(GRADLE_ENTERPRISE_ACCESS_KEY)
38+
"DEVELOCITY_ACCESS_KEY" to expr(DEVELOCITY_ACCESS_KEY)
3939
)
4040

4141
// Work-around for https://youtrack.jetbrains.com/issue/KT-86352,

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
- id: 'step-2'
101101
name: 'Build Spock'
102102
env:
103-
DEVELOCITY_ACCESS_KEY: '${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}'
103+
DEVELOCITY_ACCESS_KEY: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
104104
run: './gradlew --stacktrace ghActionsBuild "-Dvariant=${{ matrix.variant }}" "-DjavaVersion=${{ matrix.java }}" "-Dscan.tag.main-build"'
105105
- id: 'step-3'
106106
name: 'Stop Daemon'
@@ -147,7 +147,7 @@ jobs:
147147
SONATYPE_OSS_USER: '${{ secrets.SONATYPE_OSS_USER }}'
148148
SONATYPE_OSS_PASSWORD: '${{ secrets.SONATYPE_OSS_PASSWORD }}'
149149
SIGNING_PASSWORD: '${{ secrets.SIGNING_GPG_PASSWORD }}'
150-
DEVELOCITY_ACCESS_KEY: '${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}'
150+
DEVELOCITY_ACCESS_KEY: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
151151
run: './gradlew --no-parallel --stacktrace ghActionsPublish "-Dvariant=${{ matrix.variant }}" "-DjavaVersion=${{ matrix.java }}" "-Dscan.tag.main-publish"'
152152
publish-release-docs:
153153
name: 'Publish Release Docs'
@@ -179,5 +179,5 @@ jobs:
179179
name: 'Publish Docs'
180180
env:
181181
GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
182-
DEVELOCITY_ACCESS_KEY: '${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}'
182+
DEVELOCITY_ACCESS_KEY: '${{ secrets.DEVELOCITY_ACCESS_KEY }}'
183183
run: './gradlew --no-parallel --stacktrace ghActionsDocs "-Dvariant=${{ matrix.variant }}" "-DjavaVersion=${{ matrix.java }}" "-Dscan.tag.main-docs"'

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Workflow Status (branch)]]
1010
https://jitpack.io/#org.spockframework/spock[image:https://jitpack.io/v/org.spockframework/spock.svg[Jitpack]]
1111
https://codecov.io/gh/spockframework/spock[image:https://codecov.io/gh/spockframework/spock/branch/master/graph/badge.svg[Codecov]]
1212
https://gitter.im/spockframework/spock?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge[image:https://badges.gitter.im/spockframework/spock.svg[Gitter]]
13-
https://ge.spockframework.org/scans[image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A[Revved
13+
https://community.develocity.cloud/scans?search.rootProjectNames=spock[image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A[Revved
1414
up by Develocity]]
1515

1616
image::docs/images/spock-main-logo.png[width=100px,float=right]

settings.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@ if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
3232
}
3333

3434

35-
def develocityServer = "https://ge.spockframework.org"
35+
def develocityServer = "https://community.develocity.cloud"
3636
def isCiServer = System.env["CI"] || System.env["GITHUB_ACTIONS"]
3737

3838
def accessKeysAreMissing() {
3939
return !(System.env['DEVELOCITY_ACCESS_KEY']?.trim())
4040
}
4141

4242
develocity {
43+
projectId = "spockframework"
4344
buildScan {
4445
uploadInBackground = !isCiServer
4546

0 commit comments

Comments
 (0)