feat: ACI-2926 Generate config cache compatible config

zsolt-marta-bitrise · zsolt-marta-bitrise · commit dc313a4e3cf5 · 2024-09-27T16:29:02.000+02:00
diff --git a/internal/config/gradle/gradleconfig_test.go b/internal/config/gradle/gradleconfig_test.go
@@ -53,9 +53,7 @@ func TestGenerateInitGradle(t *testing.T) {
 					CIProvider: "BestCI",
 					RepoURL:    "https://github.com/some/repo",
 					// Bitrise CI specific
-					BitriseAppID:        "BitriseAppID1",
-					BitriseBuildID:      "BitriseBuildID1",
-					BitriseWorkflowName: "BitriseWorkflowName1",
+					BitriseAppID: "BitriseAppID1",
 				},
 			},
 			want:    expectedInitScriptWithoutMetrics,
@@ -76,9 +74,7 @@ func TestGenerateInitGradle(t *testing.T) {
 					CIProvider: "BestCI",
 					RepoURL:    "https://github.com/some/repo",
 					// Bitrise CI specific
-					BitriseAppID:        "BitriseAppID1",
-					BitriseBuildID:      "BitriseBuildID1",
-					BitriseWorkflowName: "BitriseWorkflowName1",
+					BitriseAppID: "BitriseAppID1",
 				},
 			},
 			want:    expectedInitScriptWithMetrics,
@@ -155,7 +151,7 @@ initscript {
         maven(url="https://jitpack.io")
     }
     dependencies {
-        classpath("io.bitrise.gradle:remote-cache:1.2.8")
+        classpath("io.bitrise.gradle:remote-cache:1.2.9")
         classpath("io.bitrise.gradle:gradle-analytics:2.1.7")
     }
 }
@@ -174,6 +170,7 @@ settingsEvaluated {
             isPush = true
             debug = true
             blobValidationLevel = "warning"
+            collectMetadata = false
         }
     }
 }
@@ -193,8 +190,6 @@ rootProject {
 
         bitrise {
             appSlug.set("BitriseAppID1")
-            buildSlug.set("BitriseBuildID1")
-            workflowName.set("BitriseWorkflowName1")
         }
     }
 }
@@ -211,7 +206,7 @@ initscript {
         maven(url="https://jitpack.io")
     }
     dependencies {
-        classpath("io.bitrise.gradle:remote-cache:1.2.8")
+        classpath("io.bitrise.gradle:remote-cache:1.2.9")
         classpath("io.bitrise.gradle:gradle-analytics:2.1.7")
     }
 }
@@ -230,6 +225,7 @@ settingsEvaluated {
             isPush = true
             debug = true
             blobValidationLevel = "warning"
+            collectMetadata = false
         }
     }
 }
@@ -264,7 +260,7 @@ initscript {
         maven(url="https://jitpack.io")
     }
     dependencies {
-        classpath("io.bitrise.gradle:remote-cache:1.2.8")
+        classpath("io.bitrise.gradle:remote-cache:1.2.9")
     }
 }
 
@@ -298,7 +294,7 @@ initscript {
         maven(url="https://jitpack.io")
     }
     dependencies {
-        classpath("io.bitrise.gradle:remote-cache:1.2.8")
+        classpath("io.bitrise.gradle:remote-cache:1.2.9")
     }
 }
 
@@ -332,7 +328,7 @@ initscript {
         maven(url="https://jitpack.io")
     }
     dependencies {
-        classpath("io.bitrise.gradle:remote-cache:1.2.8")
+        classpath("io.bitrise.gradle:remote-cache:1.2.9")
     }
 }
 
diff --git a/internal/config/gradle/initd.gradle.kts.gotemplate b/internal/config/gradle/initd.gradle.kts.gotemplate
@@ -30,6 +30,9 @@ settingsEvaluated {
             isPush = {{ .IsPushEnabled }}
             debug = {{ .IsDebugEnabled }}
             blobValidationLevel = "{{ .ValidationLevel }}"
+            {{- if .IsAnalyticsEnabled }}
+            collectMetadata = false
+            {{- end }}
         }
     }
 }
@@ -53,12 +56,6 @@ rootProject {
             {{- if .CacheConfigMetadata.BitriseAppID }}
             appSlug.set("{{ .CacheConfigMetadata.BitriseAppID }}")
             {{- end }}
-            {{- if .CacheConfigMetadata.BitriseBuildID }}
-            buildSlug.set("{{ .CacheConfigMetadata.BitriseBuildID }}")
-            {{- end }}
-            {{- if .CacheConfigMetadata.BitriseWorkflowName }}
-            workflowName.set("{{ .CacheConfigMetadata.BitriseWorkflowName }}")
-            {{- end }}
         }
     }
 }
diff --git a/internal/consts/consts.go b/internal/consts/consts.go
@@ -10,7 +10,7 @@ const (
 	AnalyticsServiceEndpoint = "https://xcode-analytics.services.bitrise.io"
 
 	// Gradle Remote Build Cache related consts
-	GradleRemoteBuildCachePluginDepVersion = "1.2.8"
+	GradleRemoteBuildCachePluginDepVersion = "1.2.9"
 
 	// Gradle Analytics related consts
 	GradleAnalyticsPluginDepVersion = "2.1.7"

Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,7 @@ func TestGenerateInitGradle(t *testing.T) {`
`53`	`53`	`CIProvider: "BestCI",`
`54`	`54`	`RepoURL: "https://github.com/some/repo",`
`55`	`55`	`// Bitrise CI specific`
`56`		`- BitriseAppID: "BitriseAppID1",`
`57`		`- BitriseBuildID: "BitriseBuildID1",`
`58`		`- BitriseWorkflowName: "BitriseWorkflowName1",`
	`56`	`+ BitriseAppID: "BitriseAppID1",`
`59`	`57`	`},`
`60`	`58`	`},`
`61`	`59`	`want: expectedInitScriptWithoutMetrics,`
`@@ -76,9 +74,7 @@ func TestGenerateInitGradle(t *testing.T) {`
`76`	`74`	`CIProvider: "BestCI",`
`77`	`75`	`RepoURL: "https://github.com/some/repo",`
`78`	`76`	`// Bitrise CI specific`
`79`		`- BitriseAppID: "BitriseAppID1",`
`80`		`- BitriseBuildID: "BitriseBuildID1",`
`81`		`- BitriseWorkflowName: "BitriseWorkflowName1",`
	`77`	`+ BitriseAppID: "BitriseAppID1",`
`82`	`78`	`},`
`83`	`79`	`},`
`84`	`80`	`want: expectedInitScriptWithMetrics,`
`@@ -155,7 +151,7 @@ initscript {`
`155`	`151`	`maven(url="https://jitpack.io")`
`156`	`152`	`}`
`157`	`153`	`dependencies {`
`158`		`- classpath("io.bitrise.gradle:remote-cache:1.2.8")`
	`154`	`+ classpath("io.bitrise.gradle:remote-cache:1.2.9")`
`159`	`155`	`classpath("io.bitrise.gradle:gradle-analytics:2.1.7")`
`160`	`156`	`}`
`161`	`157`	`}`
`@@ -174,6 +170,7 @@ settingsEvaluated {`
`174`	`170`	`isPush = true`
`175`	`171`	`debug = true`
`176`	`172`	`blobValidationLevel = "warning"`
	`173`	`+ collectMetadata = false`
`177`	`174`	`}`
`178`	`175`	`}`
`179`	`176`	`}`
`@@ -193,8 +190,6 @@ rootProject {`
`193`	`190`
`194`	`191`	`bitrise {`
`195`	`192`	`appSlug.set("BitriseAppID1")`
`196`		`- buildSlug.set("BitriseBuildID1")`
`197`		`- workflowName.set("BitriseWorkflowName1")`
`198`	`193`	`}`
`199`	`194`	`}`
`200`	`195`	`}`
`@@ -211,7 +206,7 @@ initscript {`
`211`	`206`	`maven(url="https://jitpack.io")`
`212`	`207`	`}`
`213`	`208`	`dependencies {`
`214`		`- classpath("io.bitrise.gradle:remote-cache:1.2.8")`
	`209`	`+ classpath("io.bitrise.gradle:remote-cache:1.2.9")`
`215`	`210`	`classpath("io.bitrise.gradle:gradle-analytics:2.1.7")`
`216`	`211`	`}`
`217`	`212`	`}`
`@@ -230,6 +225,7 @@ settingsEvaluated {`
`230`	`225`	`isPush = true`
`231`	`226`	`debug = true`
`232`	`227`	`blobValidationLevel = "warning"`
	`228`	`+ collectMetadata = false`
`233`	`229`	`}`
`234`	`230`	`}`
`235`	`231`	`}`
`@@ -264,7 +260,7 @@ initscript {`
`264`	`260`	`maven(url="https://jitpack.io")`
`265`	`261`	`}`
`266`	`262`	`dependencies {`
`267`		`- classpath("io.bitrise.gradle:remote-cache:1.2.8")`
	`263`	`+ classpath("io.bitrise.gradle:remote-cache:1.2.9")`
`268`	`264`	`}`
`269`	`265`	`}`
`270`	`266`
`@@ -298,7 +294,7 @@ initscript {`
`298`	`294`	`maven(url="https://jitpack.io")`
`299`	`295`	`}`
`300`	`296`	`dependencies {`
`301`		`- classpath("io.bitrise.gradle:remote-cache:1.2.8")`
	`297`	`+ classpath("io.bitrise.gradle:remote-cache:1.2.9")`
`302`	`298`	`}`
`303`	`299`	`}`
`304`	`300`
`@@ -332,7 +328,7 @@ initscript {`
`332`	`328`	`maven(url="https://jitpack.io")`
`333`	`329`	`}`
`334`	`330`	`dependencies {`
`335`		`- classpath("io.bitrise.gradle:remote-cache:1.2.8")`
	`331`	`+ classpath("io.bitrise.gradle:remote-cache:1.2.9")`
`336`	`332`	`}`
`337`	`333`	`}`
`338`	`334`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ settingsEvaluated {`
`30`	`30`	`isPush = {{ .IsPushEnabled }}`
`31`	`31`	`debug = {{ .IsDebugEnabled }}`
`32`	`32`	`blobValidationLevel = "{{ .ValidationLevel }}"`
	`33`	`+ {{- if .IsAnalyticsEnabled }}`
	`34`	`+ collectMetadata = false`
	`35`	`+ {{- end }}`
`33`	`36`	`}`
`34`	`37`	`}`
`35`	`38`	`}`
`@@ -53,12 +56,6 @@ rootProject {`
`53`	`56`	`{{- if .CacheConfigMetadata.BitriseAppID }}`
`54`	`57`	`appSlug.set("{{ .CacheConfigMetadata.BitriseAppID }}")`
`55`	`58`	`{{- end }}`
`56`		`- {{- if .CacheConfigMetadata.BitriseBuildID }}`
`57`		`- buildSlug.set("{{ .CacheConfigMetadata.BitriseBuildID }}")`
`58`		`- {{- end }}`
`59`		`- {{- if .CacheConfigMetadata.BitriseWorkflowName }}`
`60`		`- workflowName.set("{{ .CacheConfigMetadata.BitriseWorkflowName }}")`
`61`		`- {{- end }}`
`62`	`59`	`}`
`63`	`60`	`}`
`64`	`61`	`}`