Merge pull request #4231 from thaJeztah/23.0_backport_test_fixes

[23.0 backport] ci: add validation for generated docs, bump docker/bake-action
This commit is contained in:
Sebastiaan van Stijn 2023-04-26 12:59:57 +02:00 committed by GitHub
commit 91b7318833
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 8 deletions

View File

@ -58,7 +58,7 @@ jobs:
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v2
- -
name: Build name: Build
uses: docker/bake-action@v2 uses: docker/bake-action@v3
with: with:
targets: ${{ matrix.target }} targets: ${{ matrix.target }}
set: | set: |
@ -121,7 +121,7 @@ jobs:
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v2
- -
name: Build name: Build
uses: docker/bake-action@v2 uses: docker/bake-action@v3
with: with:
targets: plugins-cross targets: plugins-cross
set: | set: |

View File

@ -26,7 +26,7 @@ jobs:
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v2
- -
name: Test name: Test
uses: docker/bake-action@v2 uses: docker/bake-action@v3
with: with:
targets: test-coverage targets: test-coverage
- -

View File

@ -29,14 +29,33 @@ jobs:
- -
name: Checkout name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
with:
fetch-depth: 0
- -
name: Run name: Run
uses: docker/bake-action@v2 uses: docker/bake-action@v3
with: with:
targets: ${{ matrix.target }} 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: validate-make:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
@ -49,8 +68,6 @@ jobs:
- -
name: Checkout name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v3
with:
fetch-depth: 0
- -
name: Run name: Run
shell: 'script --return --quiet --command "bash {0}"' shell: 'script --return --quiet --command "bash {0}"'