From 112c7bedbb78759e537acb29eccb736b3c312e78 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Wed, 5 Jul 2023 19:34:25 +0100 Subject: [PATCH] change branch requirements on dev and prod deploy statements --- .github/workflows/deploy_terraform.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy_terraform.yml b/.github/workflows/deploy_terraform.yml index 2a1bfa14..b31fd5e8 100644 --- a/.github/workflows/deploy_terraform.yml +++ b/.github/workflows/deploy_terraform.yml @@ -57,7 +57,7 @@ jobs: terraform workspace select ${{ github.event.pull_request.base.ref }} || terraform workspace new ${{ github.event.pull_request.base.ref }} - name: Deploy to Dev - if: github.event.pull_request.base.ref == 'dev' && github.event.pull_request.merged == true + if: github.event.pull_request.base.ref == 'main' && github.event.pull_request.head.ref == 'dev' && github.event.pull_request.merged == true run: cd infrastructure/terraform && terraform apply -var-file=dev.tfvars -auto-approve env: name: dev @@ -72,7 +72,7 @@ jobs: AWS_PROFILE: "ProdAdmin" - name: Deploy to Prod - if: github.event.pull_request.base.ref == 'prod' && github.event.pull_request.merged == true + if: github.event.pull_request.base.ref == 'dev' && github.event.pull_request.head.ref == 'prod' && github.event.pull_request.merged == true run: cd infrastructure/terraform && terraform apply -var-file=prod.tfvars -auto-approve env: name: prod