Merge pull request #8 from Hestia-Homes/main

change branch requirements on dev and prod deploy statements
This commit is contained in:
KhalimCK 2023-07-05 19:35:04 +01:00 committed by GitHub
commit 550e09b3bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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