build containers workflow: removed conditional from job scope and mov…

…ed to step
green-coding-solutions · Oct 27, 2023 · 5807ffb · 5807ffb
1 parent 69e7c00
commit 5807ffb
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/.github/workflows/build-and-push-containers.yml b/.github/workflows/build-and-push-containers.yml
@@ -17,7 +17,6 @@ on:
 
 jobs:
   build-and-push-containers:
-    if: github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -39,7 +38,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - if: github.event_name == 'pull_request'
+      - if: github.event_name == 'pull_request' && github.event.pull_request.merged == true
         name: Build and Push auxiliary-containers (PR)
         shell: bash
         run: |