From f8a973ba4e7d4e5b90d5a89bb4a8633ceae26985 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Wed, 8 Jan 2025 13:39:08 +0100 Subject: [PATCH] ci: update bake-action to v6 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .github/workflows/.test.yml | 11 +++++------ .github/workflows/bin-image.yml | 9 ++------- .github/workflows/buildkit.yml | 8 +++----- .github/workflows/ci.yml | 21 +++------------------ .github/workflows/test.yml | 12 +++--------- 5 files changed, 16 insertions(+), 45 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index f7e32f8d42..5b07cee3ca 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -32,7 +32,6 @@ env: SETUP_BUILDKIT_IMAGE: moby/buildkit:latest jobs: - unit-prepare: runs-on: ubuntu-20.04 timeout-minutes: 10 # guardrails timeout for the whole job @@ -98,7 +97,7 @@ jobs: buildkitd-flags: --debug - name: Build dev image - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: dev set: | @@ -185,7 +184,7 @@ jobs: buildkitd-flags: --debug - name: Build dev image - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: dev set: | @@ -239,7 +238,7 @@ jobs: buildkitd-flags: --debug - name: Build dev image - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: dev set: | @@ -331,7 +330,7 @@ jobs: buildkitd-flags: --debug - name: Build dev image - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: dev set: | @@ -521,7 +520,7 @@ jobs: buildkitd-flags: --debug - name: Build dev image - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: dev set: | diff --git a/.github/workflows/bin-image.yml b/.github/workflows/bin-image.yml index 0266f6cbc8..47475d8f69 100644 --- a/.github/workflows/bin-image.yml +++ b/.github/workflows/bin-image.yml @@ -109,11 +109,6 @@ jobs: run: | platform=${{ matrix.platform }} echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Download meta bake definition uses: actions/download-artifact@v4 @@ -140,11 +135,11 @@ jobs: - name: Build id: bake - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: files: | ./docker-bake.hcl - /tmp/bake-meta.json + cwd:///tmp/bake-meta.json targets: bin-image set: | *.platform=${{ matrix.platform }} diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index fe399bc952..18ab176b75 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -37,9 +37,6 @@ jobs: needs: - validate-dco steps: - - - name: Checkout - uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -49,7 +46,7 @@ jobs: buildkitd-flags: --debug - name: Build - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: binary - @@ -146,8 +143,9 @@ jobs: docker info - name: Build test image - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: + source: . workdir: ./buildkit targets: integration-tests set: | diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e29fea3c1..4900007040 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,11 +42,6 @@ jobs: - binary - dynbinary steps: - - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -56,7 +51,7 @@ jobs: buildkitd-flags: --debug - name: Build - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: ${{ matrix.target }} - @@ -101,11 +96,6 @@ jobs: matrix: platform: ${{ fromJson(needs.prepare-cross.outputs.matrix) }} steps: - - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Prepare run: | @@ -120,7 +110,7 @@ jobs: buildkitd-flags: --debug - name: Build - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: all set: | @@ -143,11 +133,6 @@ jobs: # required to check out the repository contents: read steps: - - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -157,7 +142,7 @@ jobs: buildkitd-flags: --debug - name: Run - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: targets: govulncheck env: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0ad1b46ebb..70dc5366f4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -50,9 +50,6 @@ jobs: if [ "${{ matrix.mode }}" = "systemd" ]; then echo "SYSTEMD=true" >> $GITHUB_ENV fi - - - name: Checkout - uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -62,7 +59,7 @@ jobs: buildkitd-flags: --debug - name: Build dev image - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: dev set: | @@ -135,7 +132,7 @@ jobs: buildkitd-flags: --debug - name: Build dev image - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: dev set: | @@ -177,9 +174,6 @@ jobs: matrix: platform: ${{ fromJson(needs.smoke-prepare.outputs.matrix) }} steps: - - - name: Checkout - uses: actions/checkout@v4 - name: Prepare run: | @@ -197,7 +191,7 @@ jobs: buildkitd-flags: --debug - name: Test - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: binary-smoketest set: |