Refactor actions to deploy on successful merge to main

mikeheft · Jul 7, 2024 · 398e116 · 398e116
1 parent bd682aa
commit 398e116
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.github/workflows/terraform_and_deploy.yaml b/.github/workflows/terraform_and_deploy.yaml
@@ -9,7 +9,7 @@ jobs:
   terraform:
     name: Terraform Plan and Apply
     runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.changed_files, 'terraform/') }}
+    if: github.event_name == 'pull_request' && github.event.pull_request.merged == true && contains(github.event.pull_request.changed_files, 'terraform/')
 
     steps:
       - name: Checkout code
@@ -39,7 +39,7 @@ jobs:
     needs: [terraform]
 
     if: |
-      always() && ${{needs.terraform.result == 'success'}} || ${{needs.terraform.result == 'skipped'}}
+      always() && needs.terraform.result == 'success' || needs.terraform.result == 'skipped'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3