Merge pull request #265 from depot/gactions-cache

Fix the resolution of GitHub Actions cache endpoint
depot · Apr 8, 2024 · 45e7b2e · 45e7b2e
2 parents 800d55f + d433cc7
commit 45e7b2e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/cmd/depot/main.go b/cmd/depot/main.go
@@ -29,6 +29,7 @@ func main() {
 	if os.Getenv("DEPOT_DISABLE_OTEL") != "" {
 		helpers.DisableOTEL()
 	}
+	helpers.FixGitHubActionsCacheEnv()
 
 	cpuProfile := os.Getenv("DEPOT_CPU_PROFILE")
 	var cpuProfileFile *os.File

diff --git a/pkg/helpers/gha.go b/pkg/helpers/gha.go
@@ -0,0 +1,12 @@
+package helpers
+
+import "os"
+
+// If the CLI is running inside a Depot GitHub Actions runner, restore the original
+// GitHub Actions cache URL so that the remote BuildKit doesn't attempt to use the internal cache.
+func FixGitHubActionsCacheEnv() {
+	original := os.Getenv("GACTIONSCACHE_URL")
+	if original != "" {
+		os.Setenv("ACTIONS_CACHE_URL", original)
+	}
+}