diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 70eecf943..e11e3dbbe 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -24,23 +24,13 @@ jobs: terraform_version: "^1.7.5" terraform_wrapper: false - - name: Check for changes to Terraform - id: changed-terraform-files - uses: tj-actions/changed-files@v45 - with: - files: | - terraform/demo/** - terraform/shared/** - .github/workflows/deploy-demo.yml - name: Terraform init - if: steps.changed-terraform-files.outputs.any_changed == 'true' working-directory: terraform/demo env: AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} run: terraform init - name: Terraform apply - if: steps.changed-terraform-files.outputs.any_changed == 'true' working-directory: terraform/demo env: AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} @@ -99,16 +89,7 @@ jobs: --var LOGIN_PEM="$LOGIN_PEM" --strategy rolling - - name: Check for changes to egress config - id: changed-egress-config - uses: tj-actions/changed-files@v45 - with: - files: | - deploy-config/egress_proxy/notify-admin-demo.*.acl - .github/actions/deploy-proxy/action.yml - .github/workflows/deploy-demo.yml - name: Deploy egress proxy - if: steps.changed-egress-config.outputs.any_changed == 'true' uses: ./.github/actions/deploy-proxy env: CF_USERNAME: ${{ secrets.CLOUDGOV_USERNAME }} diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 45ae45244..23dbb029c 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -24,23 +24,13 @@ jobs: terraform_version: "^1.7.5" terraform_wrapper: false - - name: Check for changes to Terraform - id: changed-terraform-files - uses: tj-actions/changed-files@v45 - with: - files: | - terraform/production/** - terraform/shared/** - .github/workflows/deploy-prod.yml - name: Terraform init - if: steps.changed-terraform-files.outputs.any_changed == 'true' working-directory: terraform/production env: AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} run: terraform init - name: Terraform apply - if: steps.changed-terraform-files.outputs.any_changed == 'true' working-directory: terraform/production env: AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} @@ -99,16 +89,7 @@ jobs: --var LOGIN_PEM="$LOGIN_PEM" --strategy rolling - - name: Check for changes to egress config - id: changed-egress-config - uses: tj-actions/changed-files@v45 - with: - files: | - deploy-config/egress_proxy/notify-admin-production.*.acl - .github/actions/deploy-proxy/action.yml - .github/workflows/deploy-prod.yml - name: Deploy egress proxy - if: steps.changed-egress-config.outputs.any_changed == 'true' uses: ./.github/actions/deploy-proxy env: CF_USERNAME: ${{ secrets.CLOUDGOV_USERNAME }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 645bcc44d..ae593f079 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -29,23 +29,13 @@ jobs: terraform_version: "^1.7.5" terraform_wrapper: false - - name: Check for changes to Terraform - id: changed-terraform-files - uses: tj-actions/changed-files@v45 - with: - files: | - terraform/staging/** - terraform/shared/** - .github/workflows/deploy.yml - name: Terraform init - if: steps.changed-terraform-files.outputs.any_changed == 'true' working-directory: terraform/staging env: AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.TERRAFORM_STATE_SECRET_ACCESS_KEY }} run: terraform init - name: Terraform apply - if: steps.changed-terraform-files.outputs.any_changed == 'true' working-directory: terraform/staging env: AWS_ACCESS_KEY_ID: ${{ secrets.TERRAFORM_STATE_ACCESS_KEY }} @@ -106,16 +96,7 @@ jobs: --strategy rolling - - name: Check for changes to egress config - id: changed-egress-config - uses: tj-actions/changed-files@v45 - with: - files: | - deploy-config/egress_proxy/notify-admin-staging.*.acl - .github/actions/deploy-proxy/action.yml - .github/workflows/deploy.yml - name: Deploy egress proxy - if: steps.changed-egress-config.outputs.any_changed == 'true' uses: ./.github/actions/deploy-proxy env: CF_USERNAME: ${{ secrets.CLOUDGOV_USERNAME }}