From c328044636094ab46e1c64b2f26100f00345cb02 Mon Sep 17 00:00:00 2001 From: Andrew Shumway Date: Fri, 4 Oct 2024 12:03:16 -0600 Subject: [PATCH 1/2] Switch out deprecated tools in demo/prod deploy scripts --- .github/workflows/deploy-demo.yml | 4 +++- .github/workflows/deploy-prod.yml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 227c8f21cb..72925e0b1d 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -47,7 +47,7 @@ jobs: run: poetry export --without-hashes --format=requirements.txt > requirements.txt - name: Deploy to cloud.gov - uses: 18f/cg-deploy-action@main + uses: cloud-gov/cg-cli-tools@main/cg-deploy-action@main env: DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }} @@ -70,6 +70,7 @@ jobs: cf_org: gsa-tts-benefits-studio cf_space: notify-demo push_arguments: >- + push -f manifest.yml --vars-file deploy-config/demo.yml --var DANGEROUS_SALT="$DANGEROUS_SALT" --var SECRET_KEY="$SECRET_KEY" @@ -87,6 +88,7 @@ jobs: --var LOGIN_DOT_GOV_SIGNOUT_REDIRECT="$LOGIN_DOT_GOV_SIGNOUT_REDIRECT" --var LOGIN_DOT_GOV_INITIAL_SIGNIN_URL="$LOGIN_DOT_GOV_INITIAL_SIGNIN_URL" --var LOGIN_DOT_GOV_CERTS_URL="$LOGIN_DOT_GOV_CERTS_URL" + --strategy rolling - name: Check for changes to egress config id: changed-egress-config diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index b4754a101e..dd71b1e112 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -47,7 +47,7 @@ jobs: run: poetry export --without-hashes --format=requirements.txt > requirements.txt - name: Deploy to cloud.gov - uses: 18f/cg-deploy-action@main + uses: cloud-gov/cg-cli-tools@main env: DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }} @@ -70,6 +70,7 @@ jobs: cf_org: gsa-tts-benefits-studio cf_space: notify-production push_arguments: >- + push -f manifest.yml --vars-file deploy-config/production.yml --var DANGEROUS_SALT="$DANGEROUS_SALT" --var SECRET_KEY="$SECRET_KEY" @@ -87,6 +88,7 @@ jobs: --var LOGIN_DOT_GOV_SIGNOUT_REDIRECT="$LOGIN_DOT_GOV_SIGNOUT_REDIRECT" --var LOGIN_DOT_GOV_INITIAL_SIGNIN_URL="$LOGIN_DOT_GOV_INITIAL_SIGNIN_URL" --var LOGIN_DOT_GOV_CERTS_URL="$LOGIN_DOT_GOV_CERTS_URL" + --strategy rolling - name: Check for changes to egress config id: changed-egress-config From 371eb583920ace6e20e9075f3135bb9e5c7154c3 Mon Sep 17 00:00:00 2001 From: Andrew Shumway Date: Fri, 4 Oct 2024 12:08:45 -0600 Subject: [PATCH 2/2] Remove duplicate code in reference --- .github/workflows/deploy-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/deploy-demo.yml index 72925e0b1d..31b9cec6bb 100644 --- a/.github/workflows/deploy-demo.yml +++ b/.github/workflows/deploy-demo.yml @@ -47,7 +47,7 @@ jobs: run: poetry export --without-hashes --format=requirements.txt > requirements.txt - name: Deploy to cloud.gov - uses: cloud-gov/cg-cli-tools@main/cg-deploy-action@main + uses: cloud-gov/cg-cli-tools@main env: DANGEROUS_SALT: ${{ secrets.DANGEROUS_SALT }} SECRET_KEY: ${{ secrets.SECRET_KEY }}