From a745724f2a05d0a288cb2d43d954171470c085ea Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Wed, 8 Jan 2025 12:19:24 +0100
Subject: [PATCH] ci: update bake-action to v6

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 .github/workflows/build.yml             | 17 +++++++----------
 .github/workflows/deploy.yml            |  9 ++++++---
 .github/workflows/validate-upstream.yml |  3 ++-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc169ecacb..b62404c71e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -23,9 +23,6 @@ jobs:
   releaser:
     runs-on: ubuntu-24.04
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -34,7 +31,7 @@ jobs:
           driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
       -
         name: Build
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           files: |
             docker-bake.hcl
@@ -56,8 +53,9 @@ jobs:
         uses: docker/setup-buildx-action@v3
       -
         name: Build
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           files: |
             docker-bake.hcl
           targets: release
@@ -66,8 +64,9 @@ jobs:
             *.cache-to=type=gha,scope=build,mode=max
       -
         name: Check Cloudfront config
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           targets: aws-cloudfront-update
         env:
           DRY_RUN: true
@@ -99,20 +98,18 @@ jobs:
           - dockerfile-lint
           - path-warnings
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       -
         name: Validate
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           files: |
             docker-bake.hcl
           targets: ${{ matrix.target }}
           set: |
+            *.args.BUILDKIT_CONTEXT_KEEP_GIT_DIR=1
             *.cache-to=type=gha,scope=validate-${{ matrix.target }},mode=max
             *.cache-from=type=gha,scope=validate-${{ matrix.target }}
             *.cache-from=type=gha,scope=build
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index a4e6d9b904..8ce0b6285e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -90,8 +90,9 @@ jobs:
           driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
       -
         name: Build website
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           files: |
             docker-bake.hcl
           targets: release
@@ -127,8 +128,9 @@ jobs:
       -
         name: Update S3 config
         if: ${{ env.DOCS_S3_BUCKET != '' && env.DOCS_S3_CONFIG != '' }}
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           files: |
             docker-bake.hcl
           targets: aws-s3-update-config
@@ -141,8 +143,9 @@ jobs:
       -
         name: Update Cloudfront config
         if: ${{ env.DOCS_CLOUDFRONT_ID != '' }}
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           files: |
             docker-bake.hcl
           targets: aws-cloudfront-update
diff --git a/.github/workflows/validate-upstream.yml b/.github/workflows/validate-upstream.yml
index 79c048f628..3f013523ca 100644
--- a/.github/workflows/validate-upstream.yml
+++ b/.github/workflows/validate-upstream.yml
@@ -90,8 +90,9 @@ jobs:
           driver-opts: image=${{ env.SETUP_BUILDKIT_IMAGE }}
       -
         name: Validate
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
+          source: .
           files: |
             docker-bake.hcl
           targets: validate-upstream