From 808f0b8961e899901218c9b2bcf7a0d01e2def8f Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:31:13 +0100 Subject: [PATCH] ci: update bake-action to v6 Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .github/workflows/build.yml | 11 +++-------- .github/workflows/conformance.yml | 7 +------ .github/workflows/docs.yml | 12 +++++++----- .github/workflows/e2e.yml | 3 ++- 4 files changed, 13 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5ac4c615..44969db19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,11 +66,6 @@ jobs: needs: - test steps: - - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Docker meta id: meta @@ -118,7 +113,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build artifacts - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: targets: artifact-all - @@ -146,11 +141,11 @@ jobs: if-no-files-found: error - name: Build 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: image-all push: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') }} - diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index f324f38c9..7fb03b799 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -15,14 +15,9 @@ jobs: run-conformance-test: runs-on: ubuntu-latest steps: - - - name: Checkout - uses: actions/checkout@v4 - with: - fetch-depth: 0 - name: Build image - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: targets: image-local - diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 158c0303a..154b803c7 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -13,6 +13,7 @@ on: - dockerfiles/docs.Dockerfile - docs/** workflow_dispatch: + pull_request: jobs: # Build job @@ -22,28 +23,28 @@ jobs: contents: read # Build the site and upload artifacts using actions/upload-pages-artifact steps: - - name: Checkout - uses: actions/checkout@v4 - name: Setup Pages id: pages uses: actions/configure-pages@v5 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Build docs - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: - files: | - docker-bake.hcl targets: docs-export provenance: false set: | *.cache-from=type=gha,scope=docs *.cache-to=type=gha,scope=docs,mode=max + - name: Fix permissions run: | chmod -c -R +rX "./build/docs" | while read line; do echo "::warning title=Invalid file permissions automatically fixed::$line" done + - name: Upload Pages artifact uses: actions/upload-pages-artifact@v3 with: @@ -51,6 +52,7 @@ jobs: # Deploy job deploy: + if: github.event_name != 'pull_request' # Add a dependency to the build job needs: build diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 7436232a5..fd7d2fa56 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -25,8 +25,9 @@ jobs: fetch-depth: 0 - name: Build image - uses: docker/bake-action@v5 + uses: docker/bake-action@v6 with: + source: . targets: image-local - name: Start distribution server