ajordanow/adapt-for-ge-repo

build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 rootProject.group = "io.github.gradle"
-rootProject.version = "0.12.0"
+rootProject.version = "0.12.1"
 
 java {
     toolchain {

src/main/java/io/github/gradle/conventions/DevelocityConventionsPlugin.java

@@ -119,9 +119,9 @@ private void configurePublishStrategy(DevelocityConventions conventions, BuildSc
     }
 
     private static class BuildCacheConfigureAction implements Action<BuildCacheConfiguration> {
-        private static final String EU_CACHE_NODE = "https://eu-build-cache.gradle.org";
-        private static final String US_CACHE_NODE = "https://us-build-cache.gradle.org";
-        private static final String AU_CACHE_NODE = "https://au-build-cache.gradle.org";
+        private static final String EU_CACHE_NODE = "https://eun-edge.gradle.org";
+        private static final String US_CACHE_NODE = "https://usw-edge.gradle.org";
+        private static final String AU_CACHE_NODE = "https://au-edge.gradle.org";
 
         private static final String DEVELOCITY_ACCESS_KEY = "DEVELOCITY_ACCESS_KEY";
         private static final String GRADLE_CACHE_REMOTE_PUSH_PROPERTY_NAME = "gradle.cache.remote.push";

src/main/java/io/github/gradle/conventions/customvalueprovider/CIBuildCustomValueProvider.java

@@ -66,7 +66,7 @@ public TeamCityCustomValueProvider(DevelocityConventions conventions) {
         public void accept(Settings settings, BuildScanConfiguration buildScan) {
             buildScan.link("TeamCity Build", getConventions().getEnv("BUILD_URL"));
             buildScan.value(BUILD_ID, getConventions().getEnv("BUILD_ID"));
-            Optional<String> gitCommitId = DevelocityConventions.execAndGetStdout(settings.getSettingsDir(), "git", "rev-parse", "--verify", "HEAD");
+            Optional<String> gitCommitId = getConventions().getCommitId(settings.getSettingsDir());
             gitCommitId.ifPresent(s -> getConventions().setCommitId(settings.getRootDir(), buildScan, s));
         }
     }

src/main/java/io/github/gradle/conventions/customvalueprovider/DevelocityConventions.java

@@ -178,6 +178,16 @@ public void setCommitId(File projectDir, BuildScanConfiguration buildScan, Strin
             .ifPresent(repoUrl -> buildScan.link("Source", String.format("%s/commit/%s", repoUrl, commitId)));
     }
 
+    public Optional<String> getCommitId(File workDir) {
+        Provider<String> commitIdProvider = providerFactory.of(
+            CurrentCommitIdValueSource.class,
+            it -> it.parameters(
+                parameters -> parameters.getWorkDir().set(workDir)
+            )
+        );
+        return toOptional(commitIdProvider);
+    }
+
     private static Optional<String> toOptional(Provider<String> remoteGitHubRepositoryProvider) {
         return Optional.ofNullable(remoteGitHubRepositoryProvider.getOrNull());
     }
@@ -218,6 +228,22 @@ public static Optional<String> execAndGetStdout(File workingDir, String... args)
         }
     }
 
+    static Optional<String> getCurrentCommitId(File workDir) {
+        return execAndGetStdout(workDir, "git", "rev-parse", "--verify", "HEAD");
+    }
+
+    public abstract static class CurrentCommitIdValueSource implements ValueSource<String, CurrentCommitIdValueSource.Params> {
+        interface Params extends ValueSourceParameters {
+            DirectoryProperty getWorkDir();
+        }
+
+        @Nullable
+        @Override
+        public String obtain() {
+            return getCurrentCommitId(getParameters().getWorkDir().getAsFile().get()).orElse(null);
+        }
+    }
+
     static Optional<String> getRemoteGitHubRepository(File projectDir) {
         return execAndGetStdout(projectDir, "git", "config", "--get", "remote.origin.url").flatMap(DevelocityConventions::parseGitHubRemoteUrl);
     }

src/test/java/io/github/gradle/conventions/DevelocityConventionsPluginIntegrationTest.java

@@ -15,7 +15,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class DevelocityConventionsPluginIntegrationTest extends AbstractDevelocityPluginIntegrationTest {
-    private static final String EU_CACHE_NODE = "https://eu-build-cache.gradle.org";
+    private static final String EU_CACHE_NODE = "https://eun-edge.gradle.org";
     private static final String PUBLIC_DEVELOCITY_SERVER = "https://ge.gradle.org";
 
     @Test