Skip to content

Commit 547a868

Browse files
erichaagdeverichaagdev
authored
Merge pull request #678 from gradle/erichaagdev/internal-develocity
All internal components are renamed to Develocity
2 parents 4321ced + 81ebb9e commit 547a868

28 files changed

+114
-114
lines changed

‎.github/actions/gradle/experiment-1/action.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@ runs:
8080
if [ ! -z "${{ inputs.args }}" ]; then
8181
ARG_ARGS="${{ inputs.args }}"
8282
fi
83-
ARG_GE_URL=""
83+
ARG_DEVELOCITY_URL=""
8484
if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
85-
ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
85+
ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
8686
fi
8787
if [ ! -z "${{ inputs.develocityUrl }}" ]; then
88-
ARG_GE_URL="${{ inputs.develocityUrl }}"
88+
ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
8989
fi
90-
ARG_GE_ENABLE=""
90+
ARG_DEVELOCITY_ENABLE=""
9191
if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
92-
ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
92+
ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
9393
fi
9494
if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
95-
ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
95+
ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
9696
fi
9797
9898
# Navigate into the folder containing the validation scripts
@@ -107,8 +107,8 @@ runs:
107107
${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
108108
${ARG_TASKS:+"-t" "$ARG_TASKS"} \
109109
${ARG_ARGS:+"-a" "$ARG_ARGS"} \
110-
${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
111-
${ARG_GE_ENABLE:+"-e"} \
110+
${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
111+
${ARG_DEVELOCITY_ENABLE:+"-e"} \
112112
${RUNNER_DEBUG:+"--debug"}
113113
114114
# Set the Build Scan urls as outputs

‎.github/actions/gradle/experiment-2/action.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,19 @@ runs:
8383
if [ ! -z "${{ inputs.args }}" ]; then
8484
ARG_ARGS="${{ inputs.args }}"
8585
fi
86-
ARG_GE_URL=""
86+
ARG_DEVELOCITY_URL=""
8787
if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
88-
ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
88+
ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
8989
fi
9090
if [ ! -z "${{ inputs.develocityUrl }}" ]; then
91-
ARG_GE_URL="${{ inputs.develocityUrl }}"
91+
ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
9292
fi
93-
ARG_GE_ENABLE=""
93+
ARG_DEVELOCITY_ENABLE=""
9494
if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
95-
ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
95+
ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
9696
fi
9797
if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
98-
ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
98+
ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
9999
fi
100100
ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
101101
if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
114114
${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
115115
${ARG_TASKS:+"-t" "$ARG_TASKS"} \
116116
${ARG_ARGS:+"-a" "$ARG_ARGS"} \
117-
${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
118-
${ARG_GE_ENABLE:+"-e"} \
117+
${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
118+
${ARG_DEVELOCITY_ENABLE:+"-e"} \
119119
${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
120120
${RUNNER_DEBUG:+"--debug"}
121121

‎.github/actions/gradle/experiment-3/action.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,19 @@ runs:
8383
if [ ! -z "${{ inputs.args }}" ]; then
8484
ARG_ARGS="${{ inputs.args }}"
8585
fi
86-
ARG_GE_URL=""
86+
ARG_DEVELOCITY_URL=""
8787
if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
88-
ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
88+
ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
8989
fi
9090
if [ ! -z "${{ inputs.develocityUrl }}" ]; then
91-
ARG_GE_URL="${{ inputs.develocityUrl }}"
91+
ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
9292
fi
93-
ARG_GE_ENABLE=""
93+
ARG_DEVELOCITY_ENABLE=""
9494
if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
95-
ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
95+
ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
9696
fi
9797
if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
98-
ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
98+
ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
9999
fi
100100
ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
101101
if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
114114
${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
115115
${ARG_TASKS:+"-t" "$ARG_TASKS"} \
116116
${ARG_ARGS:+"-a" "$ARG_ARGS"} \
117-
${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
118-
${ARG_GE_ENABLE:+"-e"} \
117+
${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
118+
${ARG_DEVELOCITY_ENABLE:+"-e"} \
119119
${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
120120
${RUNNER_DEBUG:+"--debug"}
121121

‎.github/actions/maven/experiment-1/action.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,19 @@ runs:
8383
if [ ! -z "${{ inputs.args }}" ]; then
8484
ARG_ARGS="${{ inputs.args }}"
8585
fi
86-
ARG_GE_URL=""
86+
ARG_DEVELOCITY_URL=""
8787
if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
88-
ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
88+
ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
8989
fi
9090
if [ ! -z "${{ inputs.develocityUrl }}" ]; then
91-
ARG_GE_URL="${{ inputs.develocityUrl }}"
91+
ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
9292
fi
93-
ARG_GE_ENABLE=""
93+
ARG_DEVELOCITY_ENABLE=""
9494
if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
95-
ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
95+
ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
9696
fi
9797
if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
98-
ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
98+
ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
9999
fi
100100
ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
101101
if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
114114
${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
115115
${ARG_GOALS:+"-g" "$ARG_GOALS"} \
116116
${ARG_ARGS:+"-a" "$ARG_ARGS"} \
117-
${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
118-
${ARG_GE_ENABLE:+"-e"} \
117+
${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
118+
${ARG_DEVELOCITY_ENABLE:+"-e"} \
119119
${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
120120
${RUNNER_DEBUG:+"--debug"}
121121

‎.github/actions/maven/experiment-2/action.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,19 +83,19 @@ runs:
8383
if [ ! -z "${{ inputs.args }}" ]; then
8484
ARG_ARGS="${{ inputs.args }}"
8585
fi
86-
ARG_GE_URL=""
86+
ARG_DEVELOCITY_URL=""
8787
if [ ! -z "${{ inputs.gradleEnterpriseUrl }}" ]; then
88-
ARG_GE_URL="${{ inputs.gradleEnterpriseUrl }}"
88+
ARG_DEVELOCITY_URL="${{ inputs.gradleEnterpriseUrl }}"
8989
fi
9090
if [ ! -z "${{ inputs.develocityUrl }}" ]; then
91-
ARG_GE_URL="${{ inputs.develocityUrl }}"
91+
ARG_DEVELOCITY_URL="${{ inputs.develocityUrl }}"
9292
fi
93-
ARG_GE_ENABLE=""
93+
ARG_DEVELOCITY_ENABLE=""
9494
if [ "${{ inputs.enableGradleEnterprise }}" == "true" ]; then
95-
ARG_GE_ENABLE="${{ inputs.enableGradleEnterprise }}"
95+
ARG_DEVELOCITY_ENABLE="${{ inputs.enableGradleEnterprise }}"
9696
fi
9797
if [ "${{ inputs.enableDeveocity }}" == "true" ]; then
98-
ARG_GE_ENABLE="${{ inputs.enableDeveocity }}"
98+
ARG_DEVELOCITY_ENABLE="${{ inputs.enableDeveocity }}"
9999
fi
100100
ARG_FAIL_IF_NOT_FULLY_CACHEABLE=""
101101
if [ "${{ inputs.failIfNotFullyCacheable }}" == "true" ]; then
@@ -114,8 +114,8 @@ runs:
114114
${ARG_PROJECT_DIR:+"-p" "$ARG_PROJECT_DIR"} \
115115
${ARG_GOALS:+"-g" "$ARG_GOALS"} \
116116
${ARG_ARGS:+"-a" "$ARG_ARGS"} \
117-
${ARG_GE_URL:+"-s" "$ARG_GE_URL"} \
118-
${ARG_GE_ENABLE:+"-e"} \
117+
${ARG_DEVELOCITY_URL:+"-s" "$ARG_DEVELOCITY_URL"} \
118+
${ARG_DEVELOCITY_ENABLE:+"-e"} \
119119
${ARG_FAIL_IF_NOT_FULLY_CACHEABLE:+"-f"} \
120120
${RUNNER_DEBUG:+"--debug"}
121121

‎.github/workflows/cross-platform-testing-build-from-source.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ jobs:
5757
run:
5858
shell: ${{ matrix.shell }} {0}
5959
env:
60-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
61-
WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:GRADLE_ENTERPRISE_ACCESS_KEY
60+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
61+
WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:DEVELOCITY_ACCESS_KEY
6262
steps:
6363
- name: Set up WSL
6464
if: ${{ runner.os == 'Windows' }}

‎.github/workflows/cross-platform-testing-use-development-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ jobs:
3636
run:
3737
shell: ${{ matrix.shell }} {0}
3838
env:
39-
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
40-
WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:GRADLE_ENTERPRISE_ACCESS_KEY
39+
DEVELOCITY_ACCESS_KEY: ${{ secrets.DV_SOLUTIONS_ACCESS_KEY }}
40+
WSLENV: GITHUB_ACTIONS:GITHUB_SERVER_URL:GITHUB_REPOSITORY:GITHUB_RUN_ID:GITHUB_WORKFLOW:GITHUB_HEAD_REF:DEVELOCITY_ACCESS_KEY
4141
steps:
4242
- name: Set up WSL
4343
if: ${{ runner.os == 'Windows' }}

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ dependencies {
9090
develocityInjection("com.gradle:develocity-injection:1.1")
9191
develocityComponents("com.gradle:build-scan-summary:$buildScanSummaryVersion")
9292
develocityMavenComponents("com.gradle:gradle-enterprise-maven-extension:1.18.4")
93-
mavenComponents(project(path = ":configure-gradle-enterprise-maven-extension", configuration = "shadow"))
93+
mavenComponents(project(path = ":configure-develocity-maven-extension", configuration = "shadow"))
9494
thirdPartyMavenComponents("com.gradle:common-custom-user-data-maven-extension:2.0.1")
9595
}
9696

‎components/configure-gradle-enterprise-maven-extension/build.gradle.kts‎ renamed to ‎components/configure-develocity-maven-extension/build.gradle.kts‎

File renamed without changes.

‎components/configure-gradle-enterprise-maven-extension/src/main/java/com/gradle/ConfigureDevelocityAdaptor.java‎ renamed to ‎components/configure-develocity-maven-extension/src/main/java/com/gradle/ConfigureDevelocityAdaptor.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
public class ConfigureDevelocityAdaptor {
2121

22-
private static final String EXPERIMENT_DIR = System.getProperty("com.gradle.enterprise.build-validation.expDir");
22+
private static final String EXPERIMENT_DIR = System.getProperty("develocity.build-validation.expDir");
2323

2424
private final RootProjectExtractor rootProjectExtractor;
2525
private final Logger logger;
@@ -35,14 +35,14 @@ public void configure(DevelocityAdapter api, MavenSession session) {
3535

3636
BuildScanApiAdapter buildScan = api.getBuildScan();
3737

38-
String geUrl = System.getProperty("gradle.enterprise.url");
39-
String geAllowUntrustedServer = System.getProperty("gradle.enterprise.allowUntrustedServer");
38+
String develocityUrl = System.getProperty("develocity.url");
39+
String develocityAllowUntrustedServer = System.getProperty("develocity.allowUntrustedServer");
4040

41-
if (geUrl != null && !geUrl.isEmpty()) {
42-
buildScan.setServer(geUrl);
41+
if (develocityUrl != null && !develocityUrl.isEmpty()) {
42+
buildScan.setServer(develocityUrl);
4343
}
44-
if (geAllowUntrustedServer != null && !geAllowUntrustedServer.isEmpty()) {
45-
buildScan.setAllowUntrustedServer(Boolean.parseBoolean(geAllowUntrustedServer));
44+
if (develocityAllowUntrustedServer != null && !develocityAllowUntrustedServer.isEmpty()) {
45+
buildScan.setAllowUntrustedServer(Boolean.parseBoolean(develocityAllowUntrustedServer));
4646
}
4747

4848
String rootProjectName = rootProjectExtractor.extractRootProject(session).getName();
@@ -53,8 +53,8 @@ public void configure(DevelocityAdapter api, MavenSession session) {
5353

5454
private static void registerBuildScanActions(BuildScanApiAdapter buildScan, String rootProjectName) {
5555
buildScan.buildFinished(buildResult -> {
56-
// communicate via error file that no GE server is set
57-
boolean omitServerUrlValidation = parseBoolean(System.getProperty("com.gradle.enterprise.build-validation.omitServerUrlValidation"));
56+
// communicate via error file that no Develocity server is set
57+
boolean omitServerUrlValidation = parseBoolean(System.getProperty("develocity.build-validation.omitServerUrlValidation"));
5858
if (buildScan.getServer() == null && !omitServerUrlValidation) {
5959
buildScan.publishAlwaysIf(false); // disable publishing, otherwise scans.gradle.com will be used
6060
File errorFile = new File(EXPERIMENT_DIR, "errors.txt");
@@ -63,19 +63,19 @@ private static void registerBuildScanActions(BuildScanApiAdapter buildScan, Stri
6363
});
6464

6565
buildScan.buildFinished(buildResult -> {
66-
String expId = System.getProperty("com.gradle.enterprise.build-validation.expId");
66+
String expId = System.getProperty("develocity.build-validation.expId");
6767
addCustomValueAndSearchLink(buildScan, "Experiment id", expId);
6868
buildScan.tag(expId);
6969

70-
String runId = System.getProperty("com.gradle.enterprise.build-validation.runId");
70+
String runId = System.getProperty("develocity.build-validation.runId");
7171
addCustomValueAndSearchLink(buildScan, "Experiment run id", runId);
7272

73-
String scriptsVersion = System.getProperty("com.gradle.enterprise.build-validation.scriptsVersion");
73+
String scriptsVersion = System.getProperty("develocity.build-validation.scriptsVersion");
7474
buildScan.value("Build validation scripts", scriptsVersion);
7575
});
7676

7777
buildScan.buildScanPublished(scan -> {
78-
String runNum = System.getProperty("com.gradle.enterprise.build-validation.runNum");
78+
String runNum = System.getProperty("develocity.build-validation.runNum");
7979
URI buildScanUri = scan.getBuildScanUri();
8080
String buildScanId = scan.getBuildScanId();
8181
String port = buildScanUri.getPort() != -1 ? ":" + buildScanUri.getPort() : "";

0 commit comments

Comments
 (0)