Merge pull request #672 from crazy-max/fix-ci-dispatch
ci: fix workflow dispatch inputs
This commit is contained in:
		
						commit
						965c6a410d
					
				
							
								
								
									
										70
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										70
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @ -18,6 +18,10 @@ on: | |||||||
|     branches: |     branches: | ||||||
|       - 'master' |       - 'master' | ||||||
| 
 | 
 | ||||||
|  | env: | ||||||
|  |   BUILDX_VERSION: latest | ||||||
|  |   BUILDKIT_IMAGE: moby/buildkit:buildx-stable-1 | ||||||
|  | 
 | ||||||
| jobs: | jobs: | ||||||
|   minimal: |   minimal: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
| @ -31,9 +35,9 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build |         name: Build | ||||||
|         uses: ./action |         uses: ./action | ||||||
| @ -61,10 +65,10 @@ jobs: | |||||||
|         id: buildx |         id: buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             network=host |             network=host | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build and push |         name: Build and push | ||||||
|         id: docker_build |         id: docker_build | ||||||
| @ -110,10 +114,10 @@ jobs: | |||||||
|         id: buildx |         id: buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             network=host |             network=host | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build and push |         name: Build and push | ||||||
|         id: docker_build |         id: docker_build | ||||||
| @ -167,10 +171,10 @@ jobs: | |||||||
|         id: buildx |         id: buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             network=host |             network=host | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build and push |         name: Build and push | ||||||
|         id: docker_build |         id: docker_build | ||||||
| @ -235,9 +239,9 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build |         name: Build | ||||||
|         id: docker_build |         id: docker_build | ||||||
| @ -308,9 +312,9 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: List networks |         name: List networks | ||||||
|         run: docker network ls |         run: docker network ls | ||||||
| @ -332,9 +336,9 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build |         name: Build | ||||||
|         uses: ./ |         uses: ./ | ||||||
| @ -354,10 +358,10 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             network=host |             network=host | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build |         name: Build | ||||||
|         uses: ./ |         uses: ./ | ||||||
| @ -379,10 +383,10 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             network=host |             network=host | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build |         name: Build | ||||||
|         uses: ./ |         uses: ./ | ||||||
| @ -402,10 +406,10 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             network=host |             network=host | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build |         name: Build | ||||||
|         uses: ./ |         uses: ./ | ||||||
| @ -427,9 +431,9 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build |         name: Build | ||||||
|         uses: ./ |         uses: ./ | ||||||
| @ -450,9 +454,9 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build |         name: Build | ||||||
|         uses: ./ |         uses: ./ | ||||||
| @ -489,10 +493,10 @@ jobs: | |||||||
|         id: buildx |         id: buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             network=host |             network=host | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build and push |         name: Build and push | ||||||
|         id: docker_build |         id: docker_build | ||||||
| @ -560,7 +564,7 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver: ${{ matrix.driver }} |           driver: ${{ matrix.driver }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             network=host |             network=host | ||||||
| @ -625,10 +629,10 @@ jobs: | |||||||
|         id: buildx |         id: buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             network=host |             network=host | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build and push (1) |         name: Build and push (1) | ||||||
|         id: docker_build |         id: docker_build | ||||||
| @ -712,10 +716,10 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             network=host |             network=host | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|           buildkitd-flags: --debug |           buildkitd-flags: --debug | ||||||
|       - |       - | ||||||
|         name: Build and push |         name: Build and push | ||||||
| @ -749,10 +753,10 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             network=host |             network=host | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Build |         name: Build | ||||||
|         uses: ./ |         uses: ./ | ||||||
|  | |||||||
							
								
								
									
										8
									
								
								.github/workflows/e2e.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/e2e.yml
									
									
									
									
										vendored
									
									
								
							| @ -19,6 +19,10 @@ on: | |||||||
|     tags: |     tags: | ||||||
|       - v* |       - v* | ||||||
| 
 | 
 | ||||||
|  | env: | ||||||
|  |   BUILDX_VERSION: latest | ||||||
|  |   BUILDKIT_IMAGE: moby/buildkit:buildx-stable-1 | ||||||
|  | 
 | ||||||
| jobs: | jobs: | ||||||
|   docker: |   docker: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
| @ -83,9 +87,9 @@ jobs: | |||||||
|         name: Set up Docker Buildx |         name: Set up Docker Buildx | ||||||
|         uses: docker/setup-buildx-action@v2 |         uses: docker/setup-buildx-action@v2 | ||||||
|         with: |         with: | ||||||
|           version: ${{ matrix.buildx-version }} |           version: ${{ inputs.buildx-version || env.BUILDX_VERSION }} | ||||||
|           driver-opts: | |           driver-opts: | | ||||||
|             ${{ matrix.buildkit-image }} |             image=${{ inputs.buildkit-image || env.BUILDKIT_IMAGE }} | ||||||
|       - |       - | ||||||
|         name: Login to Registry |         name: Login to Registry | ||||||
|         if: github.event_name != 'pull_request' |         if: github.event_name != 'pull_request' | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user