Skip to content

Commit 73069bd

Browse files
committed
update bake-action to v6
Signed-off-by: CrazyMax <[email protected]>
1 parent 4c68785 commit 73069bd

File tree

5 files changed

+14
-35
lines changed

5 files changed

+14
-35
lines changed

.github/workflows/.test.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ jobs:
4040
tags: ${{ steps.set.outputs.tags }}
4141
includes: ${{ steps.set.outputs.includes }}
4242
steps:
43-
-
44-
name: Checkout
45-
uses: actions/checkout@v4
46-
-
47-
name: Expose GitHub Runtime
48-
uses: crazy-max/ghaction-github-runtime@v3
4943
-
5044
name: Set up QEMU
5145
uses: docker/setup-qemu-action@v3
@@ -89,7 +83,7 @@ jobs:
8983
});
9084
-
9185
name: Build
92-
uses: docker/bake-action@v5
86+
uses: docker/bake-action@v6
9387
with:
9488
targets: integration-tests-base
9589
set: |
@@ -155,7 +149,7 @@ jobs:
155149
buildkitd-flags: --debug
156150
-
157151
name: Build test image
158-
uses: docker/bake-action@v5
152+
uses: docker/bake-action@v6
159153
with:
160154
targets: integration-tests
161155
set: |

.github/workflows/buildkit.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,6 @@ jobs:
152152
# required to check out the repository
153153
contents: read
154154
steps:
155-
-
156-
name: Checkout
157-
uses: actions/checkout@v4
158-
with:
159-
fetch-depth: 0
160155
-
161156
name: Set up Docker Buildx
162157
uses: docker/setup-buildx-action@v3
@@ -166,7 +161,7 @@ jobs:
166161
buildkitd-flags: --debug
167162
-
168163
name: Run
169-
uses: docker/bake-action@v5
164+
uses: docker/bake-action@v6
170165
with:
171166
targets: govulncheck
172167
env:

.github/workflows/test-os.yml

+2-8
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ jobs:
3939
run: |
4040
platform=${{ matrix.platform }}
4141
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
42-
-
43-
name: Checkout
44-
uses: actions/checkout@v4
4542
-
4643
name: Set up Docker Buildx
4744
uses: docker/setup-buildx-action@v3
@@ -51,7 +48,7 @@ jobs:
5148
buildkitd-flags: --debug
5249
-
5350
name: Build
54-
uses: docker/bake-action@v5
51+
uses: docker/bake-action@v6
5552
with:
5653
provenance: false
5754
targets: binaries-for-test
@@ -240,9 +237,6 @@ jobs:
240237
- linux/amd64
241238
- linux/arm64
242239
steps:
243-
-
244-
name: Checkout
245-
uses: actions/checkout@v4
246240
-
247241
name: Set up QEMU
248242
uses: docker/setup-qemu-action@v3
@@ -255,7 +249,7 @@ jobs:
255249
buildkitd-flags: --debug
256250
-
257251
name: Build
258-
uses: docker/bake-action@v5
252+
uses: docker/bake-action@v6
259253
with:
260254
targets: integration-tests-base
261255
set: |

.github/workflows/validate.yml

+8-13
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,17 @@ jobs:
2323
prepare:
2424
runs-on: ubuntu-24.04
2525
outputs:
26-
targets: ${{ steps.targets.outputs.matrix }}
26+
targets: ${{ steps.generate.outputs.targets }}
2727
steps:
2828
-
2929
name: Checkout
3030
uses: actions/checkout@v4
3131
-
32-
name: Matrix
33-
id: targets
34-
run: |
35-
echo "matrix=$(docker buildx bake validate --print | jq -cr '.target | keys')" >> $GITHUB_OUTPUT
32+
name: List targets
33+
id: generate
34+
uses: docker/bake-action/subaction/list-targets@v6
35+
with:
36+
target: validate
3637

3738
validate:
3839
runs-on: ubuntu-24.04
@@ -49,9 +50,6 @@ jobs:
4950
if [ "$GITHUB_REPOSITORY" = "moby/buildkit" ]; then
5051
echo "GOLANGCI_LINT_MULTIPLATFORM=1" >> $GITHUB_ENV
5152
fi
52-
-
53-
name: Checkout
54-
uses: actions/checkout@v4
5553
-
5654
name: Set up Docker Buildx
5755
uses: docker/setup-buildx-action@v3
@@ -61,16 +59,13 @@ jobs:
6159
buildkitd-flags: --debug
6260
-
6361
name: Validate
64-
uses: docker/bake-action@v5
62+
uses: docker/bake-action@v6
6563
with:
6664
targets: ${{ matrix.target }}
6765

6866
archutil-arm64:
6967
runs-on: ubuntu-24.04
7068
steps:
71-
-
72-
name: Checkout
73-
uses: actions/checkout@v4
7469
-
7570
name: Set up QEMU
7671
uses: docker/setup-qemu-action@v3
@@ -83,7 +78,7 @@ jobs:
8378
buildkitd-flags: --debug
8479
-
8580
name: Validate
86-
uses: docker/bake-action@v5
81+
uses: docker/bake-action@v6
8782
with:
8883
targets: validate-archutil
8984
set: |

docker-bake.hcl

+1
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ target "validate-dockerfile" {
268268
]
269269
}
270270
name = "validate-dockerfile-${md5(dockerfile)}"
271+
inherits = ["_common"]
271272
dockerfile = dockerfile
272273
call = "check"
273274
}

0 commit comments

Comments
 (0)