Skip to content

Commit

Permalink
Merge pull request #197 from crazy-max/bake-v6
Browse files Browse the repository at this point in the history
ci: update bake-action to v6
tonistiigi authored Jan 13, 2025
2 parents 9eb0753 + e8c92a8 commit 38e6621
Showing 6 changed files with 30 additions and 69 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/.test.yml
Original file line number Diff line number Diff line change
@@ -82,12 +82,9 @@ jobs:
matrix:
target: ${{ fromJson(needs.prepare.outputs.targets) }}
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Test
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
provenance: false
targets: ${{ matrix.target }}
24 changes: 12 additions & 12 deletions .github/workflows/bats-assert.yml
Original file line number Diff line number Diff line change
@@ -18,8 +18,13 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
-
name: Login to DockerHub
if: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -28,19 +33,14 @@ jobs:
uses: docker/setup-buildx-action@v3
-
name: Test
working-directory: ./util/bats-assert
run: docker buildx bake test
-
name: Login to DockerHub
if: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
uses: docker/login-action@v3
uses: docker/bake-action@v6
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
source: "{{defaultContext}}:util/bats-assert"
targets: test
-
name: Publish
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
workdir: ./util/bats-assert
source: "{{defaultContext}}:util/bats-assert"
targets: all
push: ${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
24 changes: 9 additions & 15 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -19,12 +19,9 @@ jobs:
validate:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Validate
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
targets: validate

@@ -143,8 +140,12 @@ jobs:
- test
steps:
-
name: Checkout
uses: actions/checkout@v4
name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -163,19 +164,12 @@ jobs:
type=ref,event=pr
type=semver,pattern={{version}}
bake-target: meta-helper
-
name: Login to DockerHub
if: github.event_name != 'pull_request'
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
files: |
./docker-bake.hcl
${{ steps.meta.outputs.bake-file }}
cwd://${{ steps.meta.outputs.bake-file }}
targets: xx-all
push: ${{ github.event_name != 'pull_request' }}
25 changes: 5 additions & 20 deletions .github/workflows/ld.yml
Original file line number Diff line number Diff line change
@@ -57,9 +57,6 @@ jobs:
matrix:
target: ${{ fromJson(needs.binutils-targets.outputs.matrix) }}
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -68,7 +65,7 @@ jobs:
uses: docker/setup-buildx-action@v3
-
name: Build
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
targets: ${{ matrix.target }}
set: |
@@ -78,9 +75,6 @@ jobs:
ld64:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -89,7 +83,7 @@ jobs:
uses: docker/setup-buildx-action@v3
-
name: Build
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
targets: ld64-static-tgz
set: |
@@ -150,9 +144,6 @@ jobs:
matrix:
target: ${{ fromJson(needs.ld-targets.outputs.matrix) }}
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -161,7 +152,7 @@ jobs:
uses: docker/setup-buildx-action@v3
-
name: Build
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
targets: ${{ matrix.target }}
set: |
@@ -197,9 +188,6 @@ jobs:
utils-lipo:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -208,7 +196,7 @@ jobs:
uses: docker/setup-buildx-action@v3
-
name: Build
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
targets: lipo
set: |
@@ -218,9 +206,6 @@ jobs:
utils-sigtool:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -229,7 +214,7 @@ jobs:
uses: docker/setup-buildx-action@v3
-
name: Build
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
targets: sigtool
set: |
14 changes: 2 additions & 12 deletions .github/workflows/llvm.yml
Original file line number Diff line number Diff line change
@@ -25,9 +25,6 @@ jobs:
compiler-rt:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -36,18 +33,13 @@ jobs:
uses: docker/setup-buildx-action@v3
-
name: Build
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
files: |
./docker-bake.hcl
targets: compiler-rt

libcxx:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -56,8 +48,6 @@ jobs:
uses: docker/setup-buildx-action@v3
-
name: Build
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
files: |
./docker-bake.hcl
targets: compiler-rt
7 changes: 1 addition & 6 deletions .github/workflows/sdk-extras.yml
Original file line number Diff line number Diff line change
@@ -25,9 +25,6 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v4
-
name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -36,8 +33,6 @@ jobs:
uses: docker/setup-buildx-action@v3
-
name: Build
uses: docker/bake-action@v5
uses: docker/bake-action@v6
with:
files: |
./docker-bake.hcl
targets: sdk-extras

0 comments on commit 38e6621

Please sign in to comment.