Skip to content

Commit

Permalink
Push onto registry if pull request is merged into master
Browse files Browse the repository at this point in the history
  • Loading branch information
ylavoie committed Oct 30, 2023
1 parent 2bd1062 commit c7972dc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Build and push
uses: docker/build-push-action@v5
with:
push: ${{ github.event_name == 'pull_request' && contains(github.ref, '/merge') && github.ref == 'refs/pull/merge' && startsWith(github.head_ref, 'refs/heads/master') }}
push: ${{ github.ref == 'refs/heads/master' && github.event_name == 'pull_request' }}
tags: ghcr.io/${{github.repository_owner}}/ledgersmb_circleci-perl:${{ matrix.version }}
build-args: |
perl=${{ matrix.version }}
Expand All @@ -52,7 +52,7 @@ jobs:
- name: Build and push
uses: docker/build-push-action@v5
with:
push: ${{ github.event_name == 'pull_request' && contains(github.ref, '/merge') && github.ref == 'refs/pull/merge' && startsWith(github.head_ref, 'refs/heads/master') }}
push: ${{ github.ref == 'refs/heads/master' && github.event_name == 'pull_request' }}
tags: ghcr.io/${{github.repository_owner}}/ledgersmb_circleci-postgres:${{ matrix.version }}
build-args: |
version=${{ matrix.version }}
Expand Down

0 comments on commit c7972dc

Please sign in to comment.