gha: send v2 url as url_v2

tonistiigi · tonistiigi · commit 7ba4da08000f · 2025-02-11T15:49:29.000-08:00
Some repositories already have v2 enabled and that
causes errors avainst older BuildKit. To avoid that we
need to send both URLs as separate keys.

Signed-off-by: Tonis Tiigi &lt;tonistiigi@gmail.com&gt;
diff --git a/util/buildflags/cache.go b/util/buildflags/cache.go
@@ -210,7 +210,6 @@ func addGithubToken(ci *controllerapi.CacheOptionsEntry) {
 		if v, ok := os.LookupEnv("ACTIONS_CACHE_SERVICE_V2"); ok {
 			if b, err := strconv.ParseBool(v); err == nil && b {
 				version = "2"
-				ci.Attrs["version"] = version
 			}
 		}
 	}
@@ -222,7 +221,7 @@ func addGithubToken(ci *controllerapi.CacheOptionsEntry) {
 	if _, ok := ci.Attrs["url"]; !ok {
 		if version == "2" {
 			if v, ok := os.LookupEnv("ACTIONS_RESULTS_URL"); ok {
-				ci.Attrs["url"] = v
+				ci.Attrs["url_v2"] = v
 			}
 		} else {
 			if v, ok := os.LookupEnv("ACTIONS_CACHE_URL"); ok {

Original file line number	Diff line number	Diff line change
`@@ -210,7 +210,6 @@ func addGithubToken(ci *controllerapi.CacheOptionsEntry) {`
`210`	`210`	`if v, ok := os.LookupEnv("ACTIONS_CACHE_SERVICE_V2"); ok {`
`211`	`211`	`if b, err := strconv.ParseBool(v); err == nil && b {`
`212`	`212`	`version = "2"`
`213`		`- ci.Attrs["version"] = version`
`214`	`213`	`}`
`215`	`214`	`}`
`216`	`215`	`}`
`@@ -222,7 +221,7 @@ func addGithubToken(ci *controllerapi.CacheOptionsEntry) {`
`222`	`221`	`if _, ok := ci.Attrs["url"]; !ok {`
`223`	`222`	`if version == "2" {`
`224`	`223`	`if v, ok := os.LookupEnv("ACTIONS_RESULTS_URL"); ok {`
`225`		`- ci.Attrs["url"] = v`
	`224`	`+ ci.Attrs["url_v2"] = v`
`226`	`225`	`}`
`227`	`226`	`} else {`
`228`	`227`	`if v, ok := os.LookupEnv("ACTIONS_CACHE_URL"); ok {`