Skip to content

Commit e8c92a8

Browse files
crazy-maxcrazy-max
committed
ci: update bake-action to v6
Signed-off-by: CrazyMax <[email protected]>
1 parent 44c54ab commit e8c92a8

File tree

6 files changed

+30
-69
lines changed

6 files changed

+30
-69
lines changed

‎.github/workflows/.test.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,9 @@ jobs:
8282
matrix:
8383
target: ${{ fromJson(needs.prepare.outputs.targets) }}
8484
steps:
85-
-
86-
name: Checkout
87-
uses: actions/checkout@v4
8885
-
8986
name: Test
90-
uses: docker/bake-action@v5
87+
uses: docker/bake-action@v6
9188
with:
9289
provenance: false
9390
targets: ${{ matrix.target }}

‎.github/workflows/bats-assert.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ jobs:
1818
build:
1919
runs-on: ubuntu-latest
2020
steps:
21-
- name: Checkout
22-
uses: actions/checkout@v4
21+
-
22+
name: Login to DockerHub
23+
if: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
24+
uses: docker/login-action@v3
25+
with:
26+
username: ${{ secrets.DOCKERHUB_USERNAME }}
27+
password: ${{ secrets.DOCKERHUB_TOKEN }}
2328
-
2429
name: Set up QEMU
2530
uses: docker/setup-qemu-action@v3
@@ -28,19 +33,14 @@ jobs:
2833
uses: docker/setup-buildx-action@v3
2934
-
3035
name: Test
31-
working-directory: ./util/bats-assert
32-
run: docker buildx bake test
33-
-
34-
name: Login to DockerHub
35-
if: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
36-
uses: docker/login-action@v3
36+
uses: docker/bake-action@v6
3737
with:
38-
username: ${{ secrets.DOCKERHUB_USERNAME }}
39-
password: ${{ secrets.DOCKERHUB_TOKEN }}
38+
source: "{{defaultContext}}:util/bats-assert"
39+
targets: test
4040
-
4141
name: Publish
42-
uses: docker/bake-action@v5
42+
uses: docker/bake-action@v6
4343
with:
44-
workdir: ./util/bats-assert
44+
source: "{{defaultContext}}:util/bats-assert"
4545
targets: all
4646
push: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@ jobs:
1919
validate:
2020
runs-on: ubuntu-latest
2121
steps:
22-
-
23-
name: Checkout
24-
uses: actions/checkout@v4
2522
-
2623
name: Validate
27-
uses: docker/bake-action@v5
24+
uses: docker/bake-action@v6
2825
with:
2926
targets: validate
3027

@@ -143,8 +140,12 @@ jobs:
143140
- test
144141
steps:
145142
-
146-
name: Checkout
147-
uses: actions/checkout@v4
143+
name: Login to DockerHub
144+
if: github.event_name != 'pull_request'
145+
uses: docker/login-action@v3
146+
with:
147+
username: ${{ secrets.DOCKERHUB_USERNAME }}
148+
password: ${{ secrets.DOCKERHUB_TOKEN }}
148149
-
149150
name: Set up QEMU
150151
uses: docker/setup-qemu-action@v3
@@ -163,19 +164,12 @@ jobs:
163164
type=ref,event=pr
164165
type=semver,pattern={{version}}
165166
bake-target: meta-helper
166-
-
167-
name: Login to DockerHub
168-
if: github.event_name != 'pull_request'
169-
uses: docker/login-action@v3
170-
with:
171-
username: ${{ secrets.DOCKERHUB_USERNAME }}
172-
password: ${{ secrets.DOCKERHUB_TOKEN }}
173167
-
174168
name: Build
175-
uses: docker/bake-action@v5
169+
uses: docker/bake-action@v6
176170
with:
177171
files: |
178172
./docker-bake.hcl
179-
${{ steps.meta.outputs.bake-file }}
173+
cwd://${{ steps.meta.outputs.bake-file }}
180174
targets: xx-all
181175
push: ${{ github.event_name != 'pull_request' }}

‎.github/workflows/ld.yml‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ jobs:
5757
matrix:
5858
target: ${{ fromJson(needs.binutils-targets.outputs.matrix) }}
5959
steps:
60-
-
61-
name: Checkout
62-
uses: actions/checkout@v4
6360
-
6461
name: Set up QEMU
6562
uses: docker/setup-qemu-action@v3
@@ -68,7 +65,7 @@ jobs:
6865
uses: docker/setup-buildx-action@v3
6966
-
7067
name: Build
71-
uses: docker/bake-action@v5
68+
uses: docker/bake-action@v6
7269
with:
7370
targets: ${{ matrix.target }}
7471
set: |
@@ -78,9 +75,6 @@ jobs:
7875
ld64:
7976
runs-on: ubuntu-latest
8077
steps:
81-
-
82-
name: Checkout
83-
uses: actions/checkout@v4
8478
-
8579
name: Set up QEMU
8680
uses: docker/setup-qemu-action@v3
@@ -89,7 +83,7 @@ jobs:
8983
uses: docker/setup-buildx-action@v3
9084
-
9185
name: Build
92-
uses: docker/bake-action@v5
86+
uses: docker/bake-action@v6
9387
with:
9488
targets: ld64-static-tgz
9589
set: |
@@ -150,9 +144,6 @@ jobs:
150144
matrix:
151145
target: ${{ fromJson(needs.ld-targets.outputs.matrix) }}
152146
steps:
153-
-
154-
name: Checkout
155-
uses: actions/checkout@v4
156147
-
157148
name: Set up QEMU
158149
uses: docker/setup-qemu-action@v3
@@ -161,7 +152,7 @@ jobs:
161152
uses: docker/setup-buildx-action@v3
162153
-
163154
name: Build
164-
uses: docker/bake-action@v5
155+
uses: docker/bake-action@v6
165156
with:
166157
targets: ${{ matrix.target }}
167158
set: |
@@ -197,9 +188,6 @@ jobs:
197188
utils-lipo:
198189
runs-on: ubuntu-latest
199190
steps:
200-
-
201-
name: Checkout
202-
uses: actions/checkout@v4
203191
-
204192
name: Set up QEMU
205193
uses: docker/setup-qemu-action@v3
@@ -208,7 +196,7 @@ jobs:
208196
uses: docker/setup-buildx-action@v3
209197
-
210198
name: Build
211-
uses: docker/bake-action@v5
199+
uses: docker/bake-action@v6
212200
with:
213201
targets: lipo
214202
set: |
@@ -218,9 +206,6 @@ jobs:
218206
utils-sigtool:
219207
runs-on: ubuntu-latest
220208
steps:
221-
-
222-
name: Checkout
223-
uses: actions/checkout@v4
224209
-
225210
name: Set up QEMU
226211
uses: docker/setup-qemu-action@v3
@@ -229,7 +214,7 @@ jobs:
229214
uses: docker/setup-buildx-action@v3
230215
-
231216
name: Build
232-
uses: docker/bake-action@v5
217+
uses: docker/bake-action@v6
233218
with:
234219
targets: sigtool
235220
set: |

‎.github/workflows/llvm.yml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ jobs:
2525
compiler-rt:
2626
runs-on: ubuntu-latest
2727
steps:
28-
-
29-
name: Checkout
30-
uses: actions/checkout@v4
3128
-
3229
name: Set up QEMU
3330
uses: docker/setup-qemu-action@v3
@@ -36,18 +33,13 @@ jobs:
3633
uses: docker/setup-buildx-action@v3
3734
-
3835
name: Build
39-
uses: docker/bake-action@v5
36+
uses: docker/bake-action@v6
4037
with:
41-
files: |
42-
./docker-bake.hcl
4338
targets: compiler-rt
4439

4540
libcxx:
4641
runs-on: ubuntu-latest
4742
steps:
48-
-
49-
name: Checkout
50-
uses: actions/checkout@v4
5143
-
5244
name: Set up QEMU
5345
uses: docker/setup-qemu-action@v3
@@ -56,8 +48,6 @@ jobs:
5648
uses: docker/setup-buildx-action@v3
5749
-
5850
name: Build
59-
uses: docker/bake-action@v5
51+
uses: docker/bake-action@v6
6052
with:
61-
files: |
62-
./docker-bake.hcl
6353
targets: compiler-rt

‎.github/workflows/sdk-extras.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ jobs:
2525
build:
2626
runs-on: ubuntu-latest
2727
steps:
28-
-
29-
name: Checkout
30-
uses: actions/checkout@v4
3128
-
3229
name: Set up QEMU
3330
uses: docker/setup-qemu-action@v3
@@ -36,8 +33,6 @@ jobs:
3633
uses: docker/setup-buildx-action@v3
3734
-
3835
name: Build
39-
uses: docker/bake-action@v5
36+
uses: docker/bake-action@v6
4037
with:
41-
files: |
42-
./docker-bake.hcl
4338
targets: sdk-extras

0 commit comments

Comments
 (0)