From 2e4079548b7d8e29d93ca1891f7bcfbd7dd8b8dd Mon Sep 17 00:00:00 2001 From: Scott Fryer Date: Thu, 23 Nov 2023 10:14:56 +0000 Subject: [PATCH] Test on merge --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d373e39b97..f3ec65fee6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 @@ -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 @@ -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: