add cache-scope input

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>

Author: crazy-max

.github/workflows/.test.yml

@@ -26,6 +26,7 @@ jobs:
       id-token: write
     with:
       output: ${{ github.event_name != 'pull_request' && 'registry' || 'cacheonly' }}
+      cache: true
       meta-images: |
         public.ecr.aws/q3b5f1u4/test-docker-action
       meta-tags: |
@@ -46,6 +47,8 @@ jobs:
       id-token: write
     with:
       output: ${{ github.event_name != 'pull_request' && 'registry' || 'cacheonly' }}
+      cache: true
+      cache-scope: build-aws
       meta-images: |
         public.ecr.aws/q3b5f1u4/test-docker-action
       meta-tags: |
@@ -230,6 +233,8 @@ jobs:
       context: test
       target: hello-cross
       output: ${{ github.event_name != 'pull_request' && 'registry' || 'cacheonly' }}
+      cache: true
+      cache-scope: bake-aws
       meta-images: |
         public.ecr.aws/q3b5f1u4/test-docker-action
       meta-tags: |
@@ -284,6 +289,7 @@ jobs:
       context: test
       target: hello-cross
       output: ${{ github.event_name != 'pull_request' && 'local' || 'cacheonly' }}
+      cache: true
       artifact-name: bake-output
       bake-sbom: true
 

.github/workflows/bake.yml

@@ -32,6 +32,10 @@ on:
         description: "Enable cache to GitHub Actions cache backend"
         required: false
         default: false
+      cache-scope:
+        type: string
+        description: "Which scope cache object belongs to if cache enabled (default is target name)"
+        required: false
       cache-mode:
         type: string
         description: "Cache layers to export if cache enabled (min or max)"
@@ -181,6 +185,7 @@ jobs:
           INPUT_TARGET: ${{ inputs.target }}
           INPUT_OUTPUT: ${{ inputs.output }}
           INPUT_CACHE: ${{ inputs.cache }}
+          INPUT_CACHE-SCOPE: ${{ inputs.cache-scope }}
           INPUT_CACHE-MODE: ${{ inputs.cache-mode }}
           INPUT_META-IMAGES: ${{ inputs.meta-images }}
           INPUT_SET-META-ANNOTATIONS: ${{ inputs.set-meta-annotations }}
@@ -205,6 +210,7 @@ jobs:
             const inpTarget = core.getInput('target');
             const inpOutput = core.getInput('output');
             const inpCache = core.getBooleanInput('cache');
+            const inpCacheScope = core.getInput('cache-scope');
             const inpCacheMode = core.getInput('cache-mode');
             const inpMetaImages = core.getMultilineInput('meta-images');
             const inpSetMetaAnnotations = core.getBooleanInput('set-meta-annotations');
@@ -226,6 +232,29 @@ jobs:
               core.setOutput('source', bakeSource);
             });
             
+            let target;
+            await core.group(`Validating definition`, async () => {
+              const bake = new Bake();
+              const def = await bake.getDefinition({
+                allow: inpBakeAllow,
+                files: inpBakeFiles,
+                overrides: inpBakeSet,
+                sbom: inpBakeSbom,
+                source: bakeSource,
+                targets: [inpTarget],
+                githubToken: inpGitHubToken
+              });
+              if (!def) {
+                throw new Error('Bake definition not set');
+              }
+              const targets = Object.keys(def.target);
+              if (targets.length > 1) {
+                throw new Error(`Only one target can be built at once, found: ${targets.join(', ')}`);
+              }
+              target = targets[0];
+              core.setOutput('target', target);
+            });
+            
             let bakeFiles = inpBakeFiles;
             await core.group(`Set bake files`, async () => {
               if (bakeFiles.length === 0) {
@@ -266,34 +295,12 @@ jobs:
             await core.group(`Set bake overrides`, async () => {
               bakeOverrides.push('*.attest=type=provenance,mode=max,version=v1', '*.tags=');
               if (inpCache) {
-                bakeOverrides.push(`*.cache-from=type=gha,scope=docker-github-builder`);
-                bakeOverrides.push(`*.cache-to=type=gha,scope=docker-github-builder,mode=${inpCacheMode}`);
+                bakeOverrides.push(`*.cache-from=type=gha,scope=${inpCacheScope || target}`);
+                bakeOverrides.push(`*.cache-to=type=gha,scope=${inpCacheScope || target},mode=${inpCacheMode}`);
               }
               core.info(JSON.stringify(bakeOverrides, null, 2));
               core.setOutput('overrides', bakeOverrides.join(os.EOL));
             });
-            
-            let def;
-            await core.group(`Validating definition`, async () => {
-              const bake = new Bake();
-              def = await bake.getDefinition({
-                allow: inpBakeAllow,
-                files: bakeFiles,
-                overrides: bakeOverrides,
-                sbom: inpBakeSbom,
-                source: bakeSource,
-                targets: [inpTarget],
-                githubToken: inpGitHubToken
-              });
-              if (!def) {
-                throw new Error('Bake definition not set');
-              }
-              const targets = Object.keys(def.target);
-              if (targets.length > 1) {
-                throw new Error(`Only one target can be built at once, found: ${targets.join(', ')}`);
-              }
-              core.setOutput('target', targets[0]);
-            });
       -
         name: Login to registry
         if: ${{ inputs.output == 'registry' }}

.github/workflows/build.yml

@@ -18,6 +18,10 @@ on:
         description: "Enable cache to GitHub Actions cache backend"
         required: false
         default: false
+      cache-scope:
+        type: string
+        description: "Which scope cache object belongs to if cache enabled (default is target name if set)"
+        required: false
       cache-mode:
         type: string
         description: "Cache layers to export if cache enabled (min or max)"
@@ -159,6 +163,7 @@ jobs:
         env:
           INPUT_LOCAL-EXPORT-DIR: ${{ env.LOCAL_EXPORT_DIR }}
           INPUT_CACHE: ${{ inputs.cache }}
+          INPUT_CACHE-SCOPE: ${{ inputs.cache-scope }}
           INPUT_CACHE-MODE: ${{ inputs.cache-mode }}
           INPUT_META-IMAGES: ${{ inputs.meta-images }}
           INPUT_BUILD-OUTPUT: ${{ inputs.output }}
@@ -173,6 +178,7 @@ jobs:
           script: |
             const inpLocalExportDir = core.getInput('local-export-dir');
             const inpCache = core.getBooleanInput('cache');
+            const inpCacheScope = core.getInput('cache-scope');
             const inpCacheMode = core.getInput('cache-mode');
             const inpMetaImages = core.getMultilineInput('meta-images');
             const inpBuildOutput = core.getInput('build-output');
@@ -202,8 +208,8 @@ jobs:
             }
             
             if (inpCache) {
-              core.setOutput('cache-from', `type=gha,scope=docker-github-builder`);
-              core.setOutput('cache-to', `type=gha,scope=docker-github-builder,mode=${inpCacheMode}`);
+              core.setOutput('cache-from', `type=gha,scope=${inpCacheScope || inpBuildTarget || 'buildkit'}`);
+              core.setOutput('cache-to', `type=gha,scope=${inpCacheScope || inpBuildTarget || 'buildkit'},mode=${inpCacheMode}`);
             }
             
             if (inpSetMetaAnnotations && inpMetaAnnotations.length > 0) {