From cc571902bc41452fc3e6696ccfb1d4e726fddd64 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Fri, 10 Jan 2025 16:45:54 +0100
Subject: [PATCH] ci: update bake-action to v6

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
---
 .github/workflows/build.yml    | 31 ++++++++++---------------------
 .github/workflows/test.yml     |  5 +----
 .github/workflows/validate.yml |  5 +----
 docker-bake.hcl                |  3 +++
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 27cf3784f6..3fd0bcb378 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,17 +61,12 @@ jobs:
           - ""
           - glibc
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       -
         name: Build
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           targets: ${{ matrix.target }}
           set: |
@@ -104,8 +99,12 @@ jobs:
     if: ${{ github.event_name != 'pull_request' && github.repository == 'docker/cli' }}
     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_CLIBIN_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_CLIBIN_TOKEN }}
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -123,20 +122,13 @@ jobs:
             type=ref,event=branch
             type=ref,event=pr
             type=sha
-      -
-        name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_CLIBIN_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_CLIBIN_TOKEN }}
       -
         name: Build and push image
-        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: bin-image-cross
           push: ${{ github.event_name != 'pull_request' }}
           set: |
@@ -170,15 +162,12 @@ jobs:
       matrix:
         platform: ${{ fromJson(needs.prepare-plugins.outputs.matrix) }}
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       -
         name: Build
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           targets: plugins-cross
           set: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 9f065957a4..e1acbb0c6a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,15 +27,12 @@ jobs:
   ctn:
     runs-on: ubuntu-24.04
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       -
         name: Test
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           targets: test-coverage
       -
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index f5a32c714d..497d9f9e51 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -35,12 +35,9 @@ jobs:
           - validate-vendor
           - update-authors # ensure authors update target runs fine
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
       -
         name: Run
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           targets: ${{ matrix.target }}
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index d195792eb9..fd706deb3a 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -141,16 +141,19 @@ target "update-authors" {
 }
 
 target "test" {
+    inherits = ["_common"]
     target = "test"
     output = ["type=cacheonly"]
 }
 
 target "test-coverage" {
+    inherits = ["_common"]
     target = "test-coverage"
     output = ["build/coverage"]
 }
 
 target "e2e-image" {
+    inherits = ["_common"]
     target = "e2e"
     output = ["type=docker"]
     tags = ["${IMAGE_NAME}"]