Also deploy when PR is merged

softwaremill · Sep 23, 2024 · b3c72c0 · b3c72c0
1 parent ada1af4
commit b3c72c0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/adopt-tapir-ci.yml b/.github/workflows/adopt-tapir-ci.yml
@@ -90,7 +90,7 @@ jobs:
         run: sbt -Dsbt.task.timings=true docker:publishLocal
 
   deploy:
-    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/main' && (github.event_name != 'pull_request'  || github.event.pull_request.merged == true)
     needs: [ verify_unit_tests_lint, verify_integration ]
     runs-on: ubuntu-22.04