From 7ba4da08000f8909b5fb1fe76fd88f34357a21f6 Mon Sep 17 00:00:00 2001
From: Tonis Tiigi <tonistiigi@gmail.com>
Date: Tue, 11 Feb 2025 15:49:29 -0800
Subject: [PATCH] gha: send v2 url as url_v2

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 <tonistiigi@gmail.com>
---
 util/buildflags/cache.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/util/buildflags/cache.go b/util/buildflags/cache.go
index b144e2d7..abaa8acf 100644
--- 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 {