Skip to content

Commit

Permalink
Merge branch 'main' into amd64-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Bidon15 committed Sep 20, 2023
2 parents f029a75 + 5b50496 commit ce6c74d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/reusable_dockerfile_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
uses: "actions/checkout@v4"

- name: Build and Push
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
env:
OUTPUT_SHORT_SHA: ${{ needs.prepare-env.outputs.output_short_sha }}
OUTPUT_IMAGE_NAME: ${{ needs.prepare-env.outputs.output_image_name }}
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
github.ref != 'refs/heads/main' &&
!startsWith(github.ref, 'refs/tags/v') &&
!contains(github.ref, '-rc')
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
env:
OUTPUT_SHORT_SHA: ${{ needs.prepare-env.outputs.output_short_sha }}
OUTPUT_IMAGE_NAME: ${{ needs.prepare-env.outputs.output_image_name }}
Expand All @@ -173,7 +173,7 @@ jobs:
# the amd64 image since building the arm64 image takes significantly
# longer.
- name: Build and Push Docker Images
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
# yamllint disable
# only run when the branch is main, master or starts with v*
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') }}
Expand Down

0 comments on commit ce6c74d

Please sign in to comment.