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

@@ -286,6 +286,18 @@ var ciLoadCacheOptions = sync.OnceValues(func() (out []client.CacheOptionsEntry,
 				"url":   url,
 			},
 		})
+		out = append(out, client.CacheOptionsEntry{
+			Type: "registry",
+			Attrs: map[string]string{
+				"ref": "ghcr.io/azure/dalec/" + target + "/worker:latest",
+			},
+		})
+		out = append(out, client.CacheOptionsEntry{
+			Type: "registry",
+			Attrs: map[string]string{
+				"ref": "ghcr.io/azure/dalec/" + target + "/worker:main",
+			},
+		})
 	}
 
 	if len(out) == 0 {