Revert "Push Gradle Cache from GHA (#2597)"

9c4756f

Author: rnorth

.github/workflows/ci.yml

@@ -23,10 +23,6 @@ jobs:
             ${{ runner.os }}-gradle-home-testmatrix-
             ${{ runner.os }}-gradle-home-
       - id: set-matrix
-        env:
-          # Since we override the tests executor,
-          # we should not push empty results to the cache
-          READ_ONLY_REMOTE_GRADLE_CACHE: true
         run: |
           TASKS=$(./gradlew --no-daemon --parallel -q testMatrix)
           echo $TASKS

settings.gradle

@@ -5,17 +5,21 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.10.0"
+        classpath "gradle.plugin.ch.myniva.gradle:s3-build-cache:0.9.0"
         classpath "com.gradle.enterprise:com.gradle.enterprise.gradle.plugin:3.2.1"
     }
+
+    configurations.classpath {
+        resolutionStrategy {
+            force 'com.amazonaws:aws-java-sdk-s3:1.11.582'
+        }
+    }
 }
 
 apply plugin: 'ch.myniva.s3-build-cache'
 apply plugin: 'com.gradle.enterprise'
 
-ext.isMasterBuild = false ||
-    (System.getenv("GITHUB_REF") == "refs/heads/master") ||
-    (System.getenv("BUILD_SOURCEBRANCHNAME") == "master")
+ext.isMasterBuild = (System.getenv("CIRCLE_BRANCH") ?: System.getenv("BUILD_SOURCEBRANCHNAME")) == "master"
 
 buildCache {
     local {
@@ -27,7 +31,7 @@ buildCache {
         region = 'fra1'
         bucket = 'testcontainers'
         path = 'cache'
-        push = !(System.getenv("READ_ONLY_REMOTE_GRADLE_CACHE") || !isMasterBuild)
+        push = isMasterBuild
         headers = [
             'x-amz-acl': 'public-read'
         ]