From 698845767159fdf623b5532dce8a8f05b283c236 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:09:43 +0100 Subject: [PATCH 1/3] ci: disable provenance for docs generation Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> (cherry picked from commit 3dfb102f82e046b54ccd80af884bd09694b58cdc) --- .github/workflows/docs-release.yml | 2 ++ .github/workflows/docs-upstream.yml | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml index 7a251416..f69f2298 100644 --- a/.github/workflows/docs-release.yml +++ b/.github/workflows/docs-release.yml @@ -41,6 +41,7 @@ jobs: with: source: ${{ github.server_url }}/${{ github.repository }}.git#${{ env.RELEASE_NAME }} targets: update-docs + provenance: false set: | *.output=/tmp/buildx-docs env: @@ -54,6 +55,7 @@ jobs: uses: docker/bake-action@v4 with: targets: vendor + provenance: false set: | vendor.args.MODULE=github.com/docker/buildx@${{ env.RELEASE_NAME }} - diff --git a/.github/workflows/docs-upstream.yml b/.github/workflows/docs-upstream.yml index 2182e2f0..9e1acd1c 100644 --- a/.github/workflows/docs-upstream.yml +++ b/.github/workflows/docs-upstream.yml @@ -37,6 +37,7 @@ jobs: uses: docker/bake-action@v4 with: targets: update-docs + provenance: false set: | *.output=/tmp/buildx-docs *.cache-from=type=gha,scope=docs-yaml From 3042bfb1e4a973f49c6277119a3e11b0ac0e1668 Mon Sep 17 00:00:00 2001 From: David Karlsson <35727626+dvdksn@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:23:35 +0100 Subject: [PATCH 2/3] ci: use make target for vendoring docs release Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> (cherry picked from commit 2ec1dbd1b6eef6dcac0010628bb7d0dfeb2104c2) --- .github/workflows/docs-release.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml index f69f2298..54c8c7ba 100644 --- a/.github/workflows/docs-release.yml +++ b/.github/workflows/docs-release.yml @@ -26,7 +26,6 @@ jobs: name: Prepare run: | rm -rf ./data/buildx/* - rm -rf ./_vendor/github.com/docker/buildx if [ -n "${{ github.event.inputs.tag }}" ]; then echo "RELEASE_NAME=${{ github.event.inputs.tag }}" >> $GITHUB_ENV else @@ -52,12 +51,10 @@ jobs: cp /tmp/buildx-docs/out/reference/*.yaml ./data/buildx/ - name: Update vendor - uses: docker/bake-action@v4 - with: - targets: vendor - provenance: false - set: | - vendor.args.MODULE=github.com/docker/buildx@${{ env.RELEASE_NAME }} + run: | + make vendor + env: + VENDOR_MODULE: github.com/docker/buildx@${{ env.RELEASE_NAME }} - name: Create PR on docs repo uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc From 1a2de6a528980185bf41602ae36fdd3c393a41bb Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Thu, 14 Mar 2024 10:39:50 +0100 Subject: [PATCH 3/3] ci: enable multi-platform lint only for upstream repo Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> (cherry picked from commit 5c69fa267f8b4cbf337c4db85879b4b59d49539d) --- .github/workflows/validate.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 63aa4875..78a02c27 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -19,8 +19,6 @@ on: jobs: validate: runs-on: ubuntu-22.04 - env: - GOLANGCI_LINT_MULTIPLATFORM: 1 strategy: fail-fast: false matrix: @@ -30,6 +28,12 @@ jobs: - validate-docs - validate-generated-files steps: + - + name: Prepare + run: | + if [ "$GITHUB_REPOSITORY" = "docker/buildx" ]; then + echo "GOLANGCI_LINT_MULTIPLATFORM=1" >> $GITHUB_ENV + fi - name: Checkout uses: actions/checkout@v4