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 30dd186806..7408e2cd1d 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -29,14 +29,33 @@ jobs: - name: Checkout uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Run - uses: docker/bake-action@v2 + uses: docker/bake-action@v3 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: @@ -49,8 +68,6 @@ jobs: - name: Checkout uses: actions/checkout@v3 - with: - fetch-depth: 0 - name: Run shell: 'script --return --quiet --command "bash {0}"'