@@ -268,34 +268,8 @@ jobs:
268268 if : ${{ steps.run_check.outputs.run == 'true'}}
269269 uses : docker/setup-buildx-action@v3
270270
271- # Build and Publish images on main, master, and versioned branches.
272- #
273- # The reason we split out these steps into 2 is for better handling of
274- # forks when building amd64 images and to enable faster availability of
275- # the amd64 image since building the arm64 image takes significantly
276- # longer.
277- - name : " Merge on Main Trigger: Build and Push All Docker Images"
278- if : ${{ needs.prepare-env.outputs.build_for_merge == 'true' && steps.run_check.outputs.run == 'true'}}
279- uses : docker/build-push-action@v5
280- env :
281- OUTPUT_SHORT_SHA : ${{ needs.prepare-env.outputs.output_short_sha }}
282- OUTPUT_IMAGE_NAME : ${{ needs.prepare-env.outputs.output_image_name }}
283- with :
284- context : ${{ inputs.dockerContext}}
285- platforms : linux/arm64,linux/amd64
286- provenance : false
287- push : true
288- tags : ${{ steps.meta.outputs.tags }}
289- labels : ${{ steps.meta.outputs.labels }}
290- file : ${{ inputs.dockerfile }}
291-
292- # Build amd64 images always, and publish when it is not a fork. The Github
293- # security model prevents forks from pushing to the registry so we can
294- # only push if the branch/PR is not generated from a fork. Even though
295- # forks can't push, we still want to try and build the image to catch
296- # bugs. For testing purposes we only need an amd64 image.
297- - name : " Pull Request Trigger: Build and Push amd64 Docker Image"
298- if : ${{ needs.prepare-env.outputs.build_for_pr == 'true' && steps.run_check.outputs.run == 'true'}}
271+ - name : " Build and Push amd64 Docker Image"
272+ if : ${{ steps.run_check.outputs.run == 'true'}}
299273 uses : docker/build-push-action@v5
300274 env :
301275 OUTPUT_SHORT_SHA : ${{ needs.prepare-env.outputs.output_short_sha }}
0 commit comments