Revert "Fall back to develocity.server for cache server"

This reverts commit c86134a. See gh-78
spring-io · May 7, 2024 · 349aac6 · 349aac6
1 parent c86134a
commit 349aac6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/io/spring/ge/conventions/gradle/BuildCacheConventions.java b/src/main/java/io/spring/ge/conventions/gradle/BuildCacheConventions.java
@@ -52,10 +52,11 @@ public void execute(BuildCacheConfiguration buildCache) {
 			String cacheServer = this.env.get("DEVELOCITY_CACHE_SERVER");
 			if (cacheServer == null) {
 				cacheServer = serverOfCacheUrl(this.env.get("GRADLE_ENTERPRISE_CACHE_URL"));
+				if (cacheServer == null) {
+					cacheServer = "https://ge.spring.io";
+				}
 			}
-			if (cacheServer != null) {
-				remote.setServer(cacheServer);
-			}
+			remote.setServer(cacheServer);
 			String accessKey = this.env.get("DEVELOCITY_ACCESS_KEY");
 			if (accessKey == null) {
 				accessKey = this.env.get("GRADLE_ENTERPRISE_ACCESS_KEY");

diff --git a/src/test/java/io/spring/ge/conventions/gradle/BuildCacheConventionsTests.java b/src/test/java/io/spring/ge/conventions/gradle/BuildCacheConventionsTests.java
@@ -51,7 +51,7 @@ void localCacheIsEnabled() {
 	void remoteCacheIsEnabled() {
 		new BuildCacheConventions(DevelocityBuildCache.class).execute(this.buildCache);
 		assertThat(this.buildCache.remote.isEnabled()).isTrue();
-		assertThat(this.buildCache.remote.getServer()).isNull();
+		assertThat(this.buildCache.remote.getServer()).isEqualTo("https://ge.spring.io");
 		assertThat(this.buildCache.remote.isPush()).isFalse();
 	}