From 4a42917081386aecc59895b3dfbef14b53181e02 Mon Sep 17 00:00:00 2001
From: David Karlsson <david.karlsson@docker.com>
Date: Wed, 12 Apr 2023 09:50:38 +0200
Subject: [PATCH 1/3] ci: add validation for generated markdown

Signed-off-by: David Karlsson <david.karlsson@docker.com>
(cherry picked from commit 25ed7847ec07e5f1446794ec70aa2ac5bae4350e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .github/workflows/validate.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 30dd186806..a2963ca298 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -37,6 +37,27 @@ jobs:
         with:
           targets: ${{ matrix.target }}
 
+  # check that the generated Markdown and the checked-in files match
+  validate-md:
+    runs-on: ubuntu-20.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Generate
+        shell: 'script --return --quiet --command "bash {0}"'
+        run: |
+          make -f docker.Makefile mddocs
+      -
+        name: Validate
+        run: |
+          if [[ $(git diff --stat) != '' ]]; then
+            echo 'fail: generated files do not match checked-in files'
+            git --no-pager diff
+            exit 1
+          fi
+
   validate-make:
     runs-on: ubuntu-20.04
     strategy:

From 2cf68537d75a76ee3cf03f051fe108de0ec6ae88 Mon Sep 17 00:00:00 2001
From: David Karlsson <david.karlsson@docker.com>
Date: Wed, 12 Apr 2023 13:31:44 +0200
Subject: [PATCH 2/3] ci: remove fetch depth 0 for validate jobs

Signed-off-by: David Karlsson <david.karlsson@docker.com>
(cherry picked from commit 341c843ac2536ac2abab81cc86db4c938d3d2e5f)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .github/workflows/validate.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index a2963ca298..217b4436dd 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -29,8 +29,6 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
       -
         name: Run
         uses: docker/bake-action@v2
@@ -70,8 +68,6 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
       -
         name: Run
         shell: 'script --return --quiet --command "bash {0}"'

From 17357a77831d3dde053880ed04808ac4bde32834 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Apr 2023 09:03:03 +0000
Subject: [PATCH 3/3] build(deps): bump docker/bake-action from 2 to 3

Bumps [docker/bake-action](https://github.com/docker/bake-action) from 2 to 3.
- [Release notes](https://github.com/docker/bake-action/releases)
- [Commits](https://github.com/docker/bake-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: docker/bake-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 6c4c3c23c7655d0ec810c4b2b851a55edf7fdd26)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 .github/workflows/build.yml    | 4 ++--
 .github/workflows/test.yml     | 2 +-
 .github/workflows/validate.yml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2af6f0fe59..cb7859b001 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -58,7 +58,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
       -
         name: Build
-        uses: docker/bake-action@v2
+        uses: docker/bake-action@v3
         with:
           targets: ${{ matrix.target }}
           set: |
@@ -121,7 +121,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
       -
         name: Build
-        uses: docker/bake-action@v2
+        uses: docker/bake-action@v3
         with:
           targets: plugins-cross
           set: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8dd7729de4..57a3edb2ce 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
       -
         name: Test
-        uses: docker/bake-action@v2
+        uses: docker/bake-action@v3
         with:
           targets: test-coverage
       -
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 217b4436dd..7408e2cd1d 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -31,7 +31,7 @@ jobs:
         uses: actions/checkout@v3
       -
         name: Run
-        uses: docker/bake-action@v2
+        uses: docker/bake-action@v3
         with:
           targets: ${{ matrix.target }}