Changed pull request merge condition (#51)

ministryofjustice · Dec 4, 2024 · b7b7759 · b7b7759
1 parent 89afee9
commit b7b7759
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
@@ -51,7 +51,7 @@ jobs:
 
   deploy_to_dev_on_push_to_main:
     name: Deploy to dev on push to main
-    if: github.event_name == 'pull_request' && github.base_ref == 'refs/heads/main' && github.event.action == 'closed' && github.event.pull_request.merged == true
+    if: github.event.pull_request.merged == true && github.base_ref == 'refs/heads/main'
     uses: ./.github/workflows/deploy.yml
     needs: 
       - build
@@ -62,7 +62,7 @@ jobs:
 
   deploy_to_prod_on_push_to_main:
     name: Deploy to prod on push to main
-    if: github.event_name == 'pull_request' && github.base_ref == 'refs/heads/main' && github.event.action == 'closed' && github.event.pull_request.merged == true
+    if: github.event.pull_request.merged == true && github.base_ref == 'refs/heads/main'
     uses: ./.github/workflows/deploy.yml
     needs:
       - build