Skip to content

Commit

Permalink
Test on merge
Browse files Browse the repository at this point in the history
  • Loading branch information
steelhead31 committed Nov 23, 2023
1 parent df1c22f commit 2e40795
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
if: github.event.pull_request.merged == true
if: github.event.pull_request.merged != true

- name: Docker Build CentOS6 Image Test
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a # v2.10.0
Expand All @@ -46,7 +46,7 @@ jobs:
cache-from: type=registry,ref=adoptopenjdk/centos6_build_image:latest
cache-to: type=inline
push: false
if: github.ref != 'refs/heads/master'
if: github.ref == 'refs/heads/master'

- name: Docker Build & Push Centos6 Image to Docker Hub On Merge
uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a # v2.10.0
Expand All @@ -57,7 +57,7 @@ jobs:
cache-from: type=registry,ref=adoptopenjdk/centos6_build_image:latest
cache-to: type=inline
push: true
if: github.event.pull_request.merged == true
if: github.event.pull_request.merged != true


build-and-push-alpine3:
Expand Down

0 comments on commit 2e40795

Please sign in to comment.