From fed70a869e225e4586b40c4d5212e91b9635ffc9 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 4 Jan 2024 23:44:25 -0500 Subject: [PATCH 1/5] Update actions/checkout --- .github/workflows/deploy.yml | 2 +- .github/workflows/deploy_staging.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 72705fb8..3f070a23 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Node.js version uses: actions/setup-node@v1 diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index 572132ad..7eedda74 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up Node.js version uses: actions/setup-node@v1 From 9c7f1f2367f61f5a570d71233c67f4c17afbaa77 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 4 Jan 2024 23:57:37 -0500 Subject: [PATCH 2/5] Update actions/setup-node --- .github/workflows/deploy.yml | 2 +- .github/workflows/deploy_staging.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3f070a23..87015acd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Node.js version - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: '14.x' diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index 7eedda74..485f0bf4 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/checkout@v4 - name: Set up Node.js version - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: '14.x' From 8d450436815f684b5f6a6191d9d9ec175ef802f3 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:18:31 -0500 Subject: [PATCH 3/5] Update actions/upload-artifact --- .github/workflows/deploy.yml | 2 +- .github/workflows/deploy_staging.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 87015acd..9b2af79e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -37,7 +37,7 @@ jobs: cp web.config public/ - name: Upload artifact for deployment job - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: node-app path: ./public/ diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index 485f0bf4..0102c409 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -37,7 +37,7 @@ jobs: cp web.config public/ - name: Upload artifact for deployment job - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: node-app path: ./public/ From 1346dc477d9ec364879d8364034e9b1b2f753e65 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Fri, 5 Jan 2024 00:05:28 -0500 Subject: [PATCH 4/5] Sync deploy staging --- .github/workflows/deploy_staging.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index 0102c409..e42e640d 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -32,7 +32,7 @@ jobs: run: | node ./script/redirects.js - - name: Copy rewrites to server root + - name: Copy redirects to server root run: | cp web.config public/ From 5870c2c06ea6519e5cb8c99977776c031934f3c7 Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 4 Jan 2024 23:25:57 -0500 Subject: [PATCH 5/5] Make deployments conditional --- .github/workflows/deploy.yml | 19 +++++++++++++++++++ .github/workflows/deploy_staging.yml | 19 +++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9b2af79e..ed40820b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,6 +14,8 @@ permissions: jobs: build: runs-on: ubuntu-latest + outputs: + has-secrets: ${{ steps.check-secrets.outputs.has-secrets }} steps: - uses: actions/checkout@v4 @@ -42,6 +44,21 @@ jobs: name: node-app path: ./public/ + - name: Check for secrets + id: check-secrets + env: + has_secrets: >- + ${{ + secrets.AZURE_CLIENT_ID != '' && + secrets.AZURE_TENANT_ID != '' && + secrets.AZURE_SUBSCRIPTION_ID != '' && + 1 || + '' + }} + if: env.has_secrets + run: | + echo 'has-secrets=1' >> "$GITHUB_OUTPUT" + deploy: runs-on: ubuntu-latest needs: build @@ -49,6 +66,8 @@ jobs: name: 'production' url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} + if: needs.build.outputs.has-secrets + steps: - name: Az CLI login uses: azure/login@v1 diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml index e42e640d..d413fad1 100644 --- a/.github/workflows/deploy_staging.yml +++ b/.github/workflows/deploy_staging.yml @@ -14,6 +14,8 @@ permissions: jobs: build: runs-on: ubuntu-latest + outputs: + has-secrets: ${{ steps.check-secrets.outputs.has-secrets }} steps: - uses: actions/checkout@v4 @@ -42,6 +44,21 @@ jobs: name: node-app path: ./public/ + - name: Check for secrets + id: check-secrets + env: + has_secrets: >- + ${{ + secrets.AZURE_STAGING_CLIENT_ID != '' && + secrets.AZURE_TENANT_ID != '' && + secrets.AZURE_SUBSCRIPTION_ID != '' && + 1 || + '' + }} + if: env.has_secrets + run: | + echo 'has-secrets=1' >> "$GITHUB_OUTPUT" + deploy: runs-on: ubuntu-latest needs: build @@ -49,6 +66,8 @@ jobs: name: 'staging' url: ${{ steps.deploy-to-webapp.outputs.webapp-url }} + if: needs.build.outputs.has-secrets + steps: - name: Az CLI login uses: azure/login@v1