Skip to content

Commit 56fac63

Browse files
committed
bake: refactor inputs
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
1 parent d90f277 commit 56fac63

File tree

3 files changed

+402
-198
lines changed

3 files changed

+402
-198
lines changed

.github/workflows/.test-bake.yml

Lines changed: 150 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ jobs:
2929
contents: read
3030
id-token: write
3131
with:
32+
cache: true
33+
cache-scope: bake-aws
3234
context: test
33-
target: hello
3435
output: image
3536
push: ${{ github.event_name != 'pull_request' }}
36-
cache: true
37-
cache-scope: bake-aws
37+
sbom: true
38+
target: hello
3839
meta-images: |
3940
public.ecr.aws/q3b5f1u4/test-docker-action
4041
meta-tags: |
4142
type=raw,value=bake-ghbuilder-single-${{ github.run_id }}
42-
bake-sbom: true
4343
secrets:
4444
registry-auths: |
4545
- registry: public.ecr.aws
@@ -80,17 +80,17 @@ jobs:
8080
contents: read
8181
id-token: write
8282
with:
83+
cache: true
84+
cache-scope: bake-aws
8385
context: test
84-
target: hello-cross
8586
output: image
8687
push: ${{ github.event_name != 'pull_request' }}
87-
cache: true
88-
cache-scope: bake-aws
88+
sbom: true
89+
target: hello-cross
8990
meta-images: |
9091
public.ecr.aws/q3b5f1u4/test-docker-action
9192
meta-tags: |
9293
type=raw,value=bake-ghbuilder-${{ github.run_id }}
93-
bake-sbom: true
9494
secrets:
9595
registry-auths: |
9696
- registry: public.ecr.aws
@@ -125,25 +125,77 @@ jobs:
125125
const builderOutputs = JSON.parse(core.getInput('builder-outputs'));
126126
core.info(JSON.stringify(builderOutputs, null, 2));
127127
128-
bake-ghcr-and-aws:
128+
bake-aws-nosign:
129129
uses: ./.github/workflows/bake.yml
130130
permissions:
131131
contents: read
132132
id-token: write
133-
packages: write
134133
with:
134+
cache: true
135+
cache-scope: bake-aws-nosign
135136
context: test
136-
target: hello-cross
137137
output: image
138138
push: ${{ github.event_name != 'pull_request' }}
139+
sbom: true
140+
sign: false
141+
target: hello-cross
142+
meta-images: |
143+
public.ecr.aws/q3b5f1u4/test-docker-action
144+
meta-tags: |
145+
type=raw,value=bake-ghbuilder-nosign-${{ github.run_id }}
146+
secrets:
147+
registry-auths: |
148+
- registry: public.ecr.aws
149+
username: ${{ secrets.AWS_ACCESS_KEY_ID }}
150+
password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
151+
152+
bake-aws-nosign-verify:
153+
uses: ./.github/workflows/verify.yml
154+
if: ${{ github.event_name != 'pull_request' }}
155+
needs:
156+
- bake-aws-nosign
157+
with:
158+
builder-outputs: ${{ toJSON(needs.bake-aws-nosign.outputs) }}
159+
secrets:
160+
registry-auths: |
161+
- registry: public.ecr.aws
162+
username: ${{ secrets.AWS_ACCESS_KEY_ID }}
163+
password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
164+
165+
bake-aws-nosign-outputs:
166+
runs-on: ubuntu-24.04
167+
needs:
168+
- bake-aws-nosign
169+
steps:
170+
-
171+
name: Builder outputs
172+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
173+
env:
174+
INPUT_BUILDER-OUTPUTS: ${{ toJSON(needs.bake-aws-nosign.outputs) }}
175+
with:
176+
script: |
177+
const builderOutputs = JSON.parse(core.getInput('builder-outputs'));
178+
core.info(JSON.stringify(builderOutputs, null, 2));
179+
180+
bake-ghcr-and-aws:
181+
uses: ./.github/workflows/bake.yml
182+
permissions:
183+
contents: read
184+
id-token: write
185+
packages: write
186+
with:
139187
cache: true
140188
cache-scope: bake-aws
189+
context: test
190+
output: image
191+
push: ${{ github.event_name != 'pull_request' }}
192+
sbom: true
193+
target: hello-cross
141194
meta-images: |
142195
ghcr.io/docker/github-builder-test
143196
public.ecr.aws/q3b5f1u4/test-docker-action
144197
meta-tags: |
145198
type=raw,value=${{ github.run_id }},prefix=bake-ghcr-and-aws-
146-
bake-sbom: true
147199
secrets:
148200
registry-auths: |
149201
- registry: ghcr.io
@@ -190,13 +242,14 @@ jobs:
190242
contents: read
191243
id-token: write
192244
with:
245+
artifact-name: bake-output
246+
artifact-upload: true
247+
cache: true
193248
context: test
194-
target: hello-cross
195249
output: local
196-
push: ${{ github.event_name != 'pull_request' }}
197-
cache: true
198-
artifact-name: bake-output
199-
bake-sbom: true
250+
sbom: true
251+
sign: ${{ github.event_name != 'pull_request' }}
252+
target: hello-cross
200253

201254
bake-local-verify:
202255
uses: ./.github/workflows/verify.yml
@@ -227,13 +280,14 @@ jobs:
227280
contents: read
228281
id-token: write
229282
with:
283+
artifact-name: bake-single-output
284+
artifact-upload: true
285+
cache: true
230286
context: test
231-
target: hello
232287
output: local
233-
push: ${{ github.event_name != 'pull_request' }}
234-
cache: true
235-
artifact-name: bake-single-output
236-
bake-sbom: true
288+
sbom: true
289+
sign: ${{ github.event_name != 'pull_request' }}
290+
target: hello
237291

238292
bake-local-single-verify:
239293
uses: ./.github/workflows/verify.yml
@@ -258,6 +312,79 @@ jobs:
258312
const builderOutputs = JSON.parse(core.getInput('builder-outputs'));
259313
core.info(JSON.stringify(builderOutputs, null, 2));
260314
315+
bake-local-noupload:
316+
uses: ./.github/workflows/bake.yml
317+
permissions:
318+
contents: read
319+
id-token: write
320+
with:
321+
artifact-upload: false
322+
cache: true
323+
context: test
324+
output: local
325+
push: ${{ github.event_name != 'pull_request' }}
326+
sbom: true
327+
target: hello-cross
328+
329+
bake-local-noupload-verify:
330+
uses: ./.github/workflows/verify.yml
331+
needs:
332+
- bake-local-noupload
333+
with:
334+
builder-outputs: ${{ toJSON(needs.bake-local-noupload.outputs) }}
335+
336+
bake-local-noupload-outputs:
337+
runs-on: ubuntu-24.04
338+
needs:
339+
- bake-local-noupload
340+
steps:
341+
-
342+
name: Builder outputs
343+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
344+
env:
345+
INPUT_BUILDER-OUTPUTS: ${{ toJSON(needs.bake-local-noupload.outputs) }}
346+
with:
347+
script: |
348+
const builderOutputs = JSON.parse(core.getInput('builder-outputs'));
349+
core.info(JSON.stringify(builderOutputs, null, 2));
350+
351+
bake-local-nosign:
352+
uses: ./.github/workflows/bake.yml
353+
permissions:
354+
contents: read
355+
id-token: write
356+
with:
357+
artifact-name: bake-nosign-output
358+
artifact-upload: true
359+
cache: true
360+
context: test
361+
output: local
362+
sbom: true
363+
sign: false
364+
target: hello-cross
365+
366+
bake-local-nosign-verify:
367+
uses: ./.github/workflows/verify.yml
368+
needs:
369+
- bake-local-nosign
370+
with:
371+
builder-outputs: ${{ toJSON(needs.bake-local-nosign.outputs) }}
372+
373+
build-local-nosign-outputs:
374+
runs-on: ubuntu-24.04
375+
needs:
376+
- bake-local-nosign
377+
steps:
378+
-
379+
name: Builder outputs
380+
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
381+
env:
382+
INPUT_BUILDER-OUTPUTS: ${{ toJSON(needs.build-local-nosign.outputs) }}
383+
with:
384+
script: |
385+
const builderOutputs = JSON.parse(core.getInput('builder-outputs'));
386+
core.info(JSON.stringify(builderOutputs, null, 2));
387+
261388
bake-set-runner:
262389
uses: ./.github/workflows/bake.yml
263390
permissions:
@@ -266,9 +393,9 @@ jobs:
266393
with:
267394
runner: amd64
268395
context: test
269-
target: hello-cross
270396
output: image
271397
push: false
398+
target: hello-cross
272399
meta-images: |
273400
public.ecr.aws/q3b5f1u4/test-docker-action
274401
meta-tags: |

0 commit comments

Comments
 (0)