mirror of
				https://gitea.com/Lydanne/buildx.git
				synced 2025-11-04 18:13:42 +08:00 
			
		
		
		
	Merge pull request #2894 from crazy-max/ci-update-bake-action
ci: update bake-action to v6
This commit is contained in:
		
							
								
								
									
										18
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							@@ -126,8 +126,9 @@ jobs:
 | 
				
			|||||||
          buildkitd-flags: --debug
 | 
					          buildkitd-flags: --debug
 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Build test image
 | 
					        name: Build test image
 | 
				
			||||||
        uses: docker/bake-action@v5
 | 
					        uses: docker/bake-action@v6
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
 | 
					          source: .
 | 
				
			||||||
          targets: integration-test
 | 
					          targets: integration-test
 | 
				
			||||||
          set: |
 | 
					          set: |
 | 
				
			||||||
            *.output=type=docker,name=${{ env.TEST_IMAGE_ID }}
 | 
					            *.output=type=docker,name=${{ env.TEST_IMAGE_ID }}
 | 
				
			||||||
@@ -299,9 +300,6 @@ jobs:
 | 
				
			|||||||
      # required to write sarif report
 | 
					      # required to write sarif report
 | 
				
			||||||
      security-events: write
 | 
					      security-events: write
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      -
 | 
					 | 
				
			||||||
        name: Checkout
 | 
					 | 
				
			||||||
        uses: actions/checkout@v4
 | 
					 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Set up Docker Buildx
 | 
					        name: Set up Docker Buildx
 | 
				
			||||||
        uses: docker/setup-buildx-action@v3
 | 
					        uses: docker/setup-buildx-action@v3
 | 
				
			||||||
@@ -311,7 +309,7 @@ jobs:
 | 
				
			|||||||
          buildkitd-flags: --debug
 | 
					          buildkitd-flags: --debug
 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Run
 | 
					        name: Run
 | 
				
			||||||
        uses: docker/bake-action@v5
 | 
					        uses: docker/bake-action@v6
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          targets: govulncheck
 | 
					          targets: govulncheck
 | 
				
			||||||
        env:
 | 
					        env:
 | 
				
			||||||
@@ -391,9 +389,6 @@ jobs:
 | 
				
			|||||||
      - test-unit
 | 
					      - test-unit
 | 
				
			||||||
    if: ${{ github.event_name != 'pull_request' && github.repository == 'docker/buildx' }}
 | 
					    if: ${{ github.event_name != 'pull_request' && github.repository == 'docker/buildx' }}
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      -
 | 
					 | 
				
			||||||
        name: Checkout
 | 
					 | 
				
			||||||
        uses: actions/checkout@v4
 | 
					 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Set up QEMU
 | 
					        name: Set up QEMU
 | 
				
			||||||
        uses: docker/setup-qemu-action@v3
 | 
					        uses: docker/setup-qemu-action@v3
 | 
				
			||||||
@@ -425,11 +420,11 @@ jobs:
 | 
				
			|||||||
          password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
 | 
					          password: ${{ secrets.DOCKERPUBLICBOT_WRITE_PAT }}
 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Build and push image
 | 
					        name: Build and push image
 | 
				
			||||||
        uses: docker/bake-action@v5
 | 
					        uses: docker/bake-action@v6
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          files: |
 | 
					          files: |
 | 
				
			||||||
            ./docker-bake.hcl
 | 
					            ./docker-bake.hcl
 | 
				
			||||||
            ${{ steps.meta.outputs.bake-file }}
 | 
					            cwd://${{ steps.meta.outputs.bake-file }}
 | 
				
			||||||
          targets: image-cross
 | 
					          targets: image-cross
 | 
				
			||||||
          push: ${{ github.event_name != 'pull_request' }}
 | 
					          push: ${{ github.event_name != 'pull_request' }}
 | 
				
			||||||
          sbom: true
 | 
					          sbom: true
 | 
				
			||||||
@@ -448,9 +443,6 @@ jobs:
 | 
				
			|||||||
    needs:
 | 
					    needs:
 | 
				
			||||||
      - bin-image
 | 
					      - bin-image
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      -
 | 
					 | 
				
			||||||
        name: Checkout
 | 
					 | 
				
			||||||
        uses: actions/checkout@v4
 | 
					 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Login to DockerHub
 | 
					        name: Login to DockerHub
 | 
				
			||||||
        uses: docker/login-action@v3
 | 
					        uses: docker/login-action@v3
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/docs-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/docs-release.yml
									
									
									
									
										vendored
									
									
								
							@@ -56,7 +56,7 @@ jobs:
 | 
				
			|||||||
          buildkitd-flags: --debug
 | 
					          buildkitd-flags: --debug
 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Generate yaml
 | 
					        name: Generate yaml
 | 
				
			||||||
        uses: docker/bake-action@v5
 | 
					        uses: docker/bake-action@v6
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          source: ${{ github.server_url }}/${{ github.repository }}.git#${{ env.RELEASE_NAME }}
 | 
					          source: ${{ github.server_url }}/${{ github.repository }}.git#${{ env.RELEASE_NAME }}
 | 
				
			||||||
          targets: update-docs
 | 
					          targets: update-docs
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										5
									
								
								.github/workflows/docs-upstream.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/docs-upstream.yml
									
									
									
									
										vendored
									
									
								
							@@ -37,9 +37,6 @@ jobs:
 | 
				
			|||||||
  docs-yaml:
 | 
					  docs-yaml:
 | 
				
			||||||
    runs-on: ubuntu-24.04
 | 
					    runs-on: ubuntu-24.04
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      -
 | 
					 | 
				
			||||||
        name: Checkout
 | 
					 | 
				
			||||||
        uses: actions/checkout@v4
 | 
					 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Set up Docker Buildx
 | 
					        name: Set up Docker Buildx
 | 
				
			||||||
        uses: docker/setup-buildx-action@v3
 | 
					        uses: docker/setup-buildx-action@v3
 | 
				
			||||||
@@ -49,7 +46,7 @@ jobs:
 | 
				
			|||||||
          buildkitd-flags: --debug
 | 
					          buildkitd-flags: --debug
 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Build reference YAML docs
 | 
					        name: Build reference YAML docs
 | 
				
			||||||
        uses: docker/bake-action@v5
 | 
					        uses: docker/bake-action@v6
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          targets: update-docs
 | 
					          targets: update-docs
 | 
				
			||||||
          provenance: false
 | 
					          provenance: false
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										4
									
								
								.github/workflows/e2e.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/e2e.yml
									
									
									
									
										vendored
									
									
								
							@@ -35,8 +35,6 @@ jobs:
 | 
				
			|||||||
  build:
 | 
					  build:
 | 
				
			||||||
    runs-on: ubuntu-24.04
 | 
					    runs-on: ubuntu-24.04
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - name: Checkout
 | 
					 | 
				
			||||||
        uses: actions/checkout@v4
 | 
					 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Set up Docker Buildx
 | 
					        name: Set up Docker Buildx
 | 
				
			||||||
        uses: docker/setup-buildx-action@v3
 | 
					        uses: docker/setup-buildx-action@v3
 | 
				
			||||||
@@ -46,7 +44,7 @@ jobs:
 | 
				
			|||||||
          buildkitd-flags: --debug
 | 
					          buildkitd-flags: --debug
 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Build
 | 
					        name: Build
 | 
				
			||||||
        uses: docker/bake-action@v5
 | 
					        uses: docker/bake-action@v6
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          targets: binaries
 | 
					          targets: binaries
 | 
				
			||||||
          set: |
 | 
					          set: |
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										5
									
								
								.github/workflows/validate.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/validate.yml
									
									
									
									
										vendored
									
									
								
							@@ -94,9 +94,6 @@ jobs:
 | 
				
			|||||||
          if [ "$GITHUB_REPOSITORY" = "docker/buildx" ]; then
 | 
					          if [ "$GITHUB_REPOSITORY" = "docker/buildx" ]; then
 | 
				
			||||||
            echo "GOLANGCI_LINT_MULTIPLATFORM=1" >> $GITHUB_ENV
 | 
					            echo "GOLANGCI_LINT_MULTIPLATFORM=1" >> $GITHUB_ENV
 | 
				
			||||||
          fi
 | 
					          fi
 | 
				
			||||||
      -
 | 
					 | 
				
			||||||
        name: Checkout
 | 
					 | 
				
			||||||
        uses: actions/checkout@v4
 | 
					 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Set up Docker Buildx
 | 
					        name: Set up Docker Buildx
 | 
				
			||||||
        uses: docker/setup-buildx-action@v3
 | 
					        uses: docker/setup-buildx-action@v3
 | 
				
			||||||
@@ -106,7 +103,7 @@ jobs:
 | 
				
			|||||||
          buildkitd-flags: --debug
 | 
					          buildkitd-flags: --debug
 | 
				
			||||||
      -
 | 
					      -
 | 
				
			||||||
        name: Validate
 | 
					        name: Validate
 | 
				
			||||||
        uses: docker/bake-action@v5
 | 
					        uses: docker/bake-action@v6
 | 
				
			||||||
        with:
 | 
					        with:
 | 
				
			||||||
          targets: ${{ matrix.target }}
 | 
					          targets: ${{ matrix.target }}
 | 
				
			||||||
          set: |
 | 
					          set: |
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user