Merge branch 'CommsJKUAT:main' into main

CommsJKUAT · Dec 7, 2024 · c634fc8 · c634fc8
2 parents 78c4032 + cb33478
commit c634fc8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/azure-static-web-apps-lively-mud-042177e03.yml b/.github/workflows/azure-static-web-apps-lively-mud-042177e03.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   build_and_deploy_job:
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
+    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed' && github.event.pull_request.merged == true)
     runs-on: ubuntu-latest
     name: Build and Deploy Job
     steps:
@@ -43,7 +43,7 @@ jobs:
           output_location: 'dist'
 
   close_pull_request_job:
-    if: github.event_name == 'pull_request' && github.event.action == 'closed'
+    if: github.event_name == 'pull_request' && github.event.action == 'closed' && github.event.pull_request.merged == true
     runs-on: ubuntu-latest
     name: Close Pull Request Job
     steps:
@@ -52,4 +52,4 @@ jobs:
         uses: Azure/static-web-apps-deploy@v1
         with:
           azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_LIVELY_MUD_042177E03 }}
-          action: "close"
+          action: "close"