tests: Add worker image to cache-from

Signed-off-by: Brian Goff <[email protected]>

Author: cpuguy83

.github/workflows/worker-images.yml

@@ -118,8 +118,15 @@ jobs:
         name: Setup (merged)
         run: |
           set -ex -o pipefail
-          EXTRA_FLAGS="--set worker.cache-to=type=gha,scope=main.${{matrix.target}},mode=max --set worker.cache-from=type=gha,scope=${MAIN_CACHE_SCOPE}"
+          ref="${{github.ref}}"
+          branch="${ref#refs/heads/}"
+          branch_scope="${branch//\//-}" # Replace slashes with dashes
+          gha_scope="${branch_scope}.${{matrix.target}}"
+
+          EXTRA_FLAGS="--set worker.cache-to=type=gha,scope=${gha_scope},mode=max --set worker.cache-from=type=gha,scope=${MAIN_CACHE_SCOPE} --set worker.cache-from=type=gha,scope=${gha_scope}"
+          EXTRA_FALGS+=" --set worker.tags=ghcr.io/${IMAGE_REPO}:${branch_scope} --set cache-to=type=inline --cache-from=type=registry,ref=${IMAGE_REPO}:${branch_scope} --push"
           echo "EXTRA_FLAGS=${EXTRA_FLAGS}" >> $GITHUB_ENV
+
       - name: Setup QEMU
         run: docker run --rm --privileged tonistiigi/binfmt:latest --install all
       - name: Expose GitHub tokens for caching

test/testenv/build.go

@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"path"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"sync"
 	"testing"
 
@@ -230,7 +230,7 @@ func ghaAnnotation(skipFrames int, cmd string, msg string) {
 
 func ghaAnnotationf(skipFrames int, cmd string, format string, args ...any) {
 	_, f, l, _ := runtime.Caller(skipFrames + 1)
-	if os.Getenv("GITHUB_ACTIONS") != "true" {
+	if !isGHA {
 		// not running in a github action, nothing to do
 		return
 	}
@@ -240,64 +240,85 @@ func ghaAnnotationf(skipFrames int, cmd string, format string, args ...any) {
 	fmt.Printf(format, args...)
 }
 
-var ciLoadCacheOptions = sync.OnceValues(func() (out []client.CacheOptionsEntry, ok bool) {
-	const (
-		ghaEnv   = "GITHUB_ACTIONS"
-		tokenEnv = "ACTIONS_RUNTIME_TOKEN"
-		urlEnv   = "ACTIONS_CACHE_URL"
-	)
-	if os.Getenv(ghaEnv) != "true" {
-		// not running in a github action, nothing to do
-		return out, false
-	}
-
-	ghaAnnotation(0, "notice", "Loading cache options for GitHub Actions")
-
-	// token and url are required for the cache to work.
-	// These need to be exposed as environment variables in the GitHub Actions workflow.
-	// See the crazy-max/ghaction-github-runtime@v3 action.
-	token := os.Getenv(tokenEnv)
-	if token == "" {
-		ghaAnnotationf(0, "warning", "%s is not set, skipping cache export", tokenEnv)
-		return nil, true
-	}
+var (
+	ghaEnv   = os.Getenv("GITHUB_ACTIONS")
+	ghaEvent = os.Getenv("GITHUB_EVENT_NAME")
+	tokenEnv = os.Getenv("ACTIONS_RUNTIME_TOKEN")
+	urlEnv   = os.Getenv("ACTIONS_CACHE_URL")
+	isGHA    = ghaEnv == "true"
 
-	url := os.Getenv("ACTIONS_CACHE_URL")
-	if url == "" {
-		ghaAnnotationf(0, "warning", "%s is not set, skipping cache export", urlEnv)
-		return nil, true
-	}
+	canAddGHACache = isGHA && tokenEnv != "" && urlEnv != ""
+	workerCaches   = sync.OnceValues(getWorkerCaches)
+)
 
-	// Unfortunately we need to load all the caches because at this level we do
-	// not know what the build target will be since that will be done at the
-	// gateway client level, where we can't set cache imports.
+func loadWorkers() []string {
+	var workers []string
 	filter := func(r *plugins.Registration) bool {
-		return r.Type != plugins.TypeBuildTarget
+		return r.Type == plugins.TypeBuildTarget
 	}
 
 	for _, r := range plugins.Graph(filter) {
-		target := path.Join(r.ID, "worker")
-		ghaAnnotationf(0, "notice", "Adding cache import: type: gha target: %q", "gha", target)
-		out = append(out, client.CacheOptionsEntry{
-			Type: "gha",
-			Attrs: map[string]string{
-				"scope": "main." + target,
-				"token": token,
-				"url":   url,
-			},
-		})
+		worker, _, _ := strings.Cut(r.ID, "/")
+		workers = append(workers, worker)
 	}
+	return workers
+}
 
-	if len(out) == 0 {
-		ghaAnnotation(0, "error", "No build targets found, skipping cache export")
+func getWorkerCaches() (cacheTo []client.CacheOptionsEntry, cacheFrom []client.CacheOptionsEntry) {
+	for _, worker := range loadWorkers() {
+		cacheFrom = append(cacheFrom, []client.CacheOptionsEntry{
+			{
+				Type: "registry",
+				Attrs: map[string]string{
+					"ref": "ghcr.io/azure/dalec/" + worker + "/worker:main",
+				},
+			},
+			{
+				Type: "registry",
+				Attrs: map[string]string{
+					"ref": "ghcr.io/azure/dalec/" + worker + "/worker:latest",
+				},
+			},
+		}...)
+
+		if canAddGHACache {
+			cacheFrom = append(cacheTo, client.CacheOptionsEntry{
+				Type: "gha",
+				Attrs: map[string]string{
+					"scope": "main." + worker,
+					"token": tokenEnv,
+					"url":   urlEnv,
+				},
+			})
+
+			if ghaEvent == "pull_request" {
+				cacheFrom = append(cacheTo, client.CacheOptionsEntry{
+					Type: "gha",
+					Attrs: map[string]string{
+						"scope": "main." + worker,
+						"token": tokenEnv,
+						"url":   urlEnv,
+					},
+				})
+
+				cacheTo = append(cacheFrom, client.CacheOptionsEntry{
+					Type: "gha",
+					Attrs: map[string]string{
+						"scope": "pr." + worker,
+						"token": tokenEnv,
+						"url":   urlEnv,
+						"mode":  "max",
+					},
+				})
+			}
+		}
 	}
-	return out, true
-})
 
-func withCICache(opts *client.SolveOpt) bool {
-	imports, ok := ciLoadCacheOptions()
-	if ok {
-		opts.CacheImports = append(opts.CacheImports, imports...)
-	}
-	return ok
+	return
+}
+
+func withCICache(opts *client.SolveOpt) {
+	cacheTo, cacheFrom := workerCaches()
+	opts.CacheImports = append(opts.CacheImports, cacheFrom...)
+	opts.CacheExports = append(opts.CacheExports, cacheTo...)
 }

test/testenv/buildx.go

@@ -378,10 +378,7 @@ func (b *BuildxEnv) RunTest(ctx context.Context, t *testing.T, f TestFunc, opts
 		f(&so)
 	}
 
-	ok := withCICache(&so)
-	if ok && len(so.CacheImports) == 0 {
-		t.Fatal("github cache is enabled but no cache imports are set")
-	}
+	withCICache(&so)
 
 	_, err = c.Build(ctx, so, "", func(ctx context.Context, gwc gwclient.Client) (*gwclient.Result, error) {
 		gwc = &clientForceDalecWithInput{gwc}