From 13ff888e31fb875cbfe4d42aabf50162f255fe60 Mon Sep 17 00:00:00 2001 From: "E. Lynette Rayle" Date: Thu, 11 Jul 2024 11:26:57 -0400 Subject: [PATCH 1/2] use v2.0.0 deploy & pass docker build args --- .github/workflows/build-and-deploy-dev.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-dev.yml b/.github/workflows/build-and-deploy-dev.yml index e67c69da..24d90ce3 100644 --- a/.github/workflows/build-and-deploy-dev.yml +++ b/.github/workflows/build-and-deploy-dev.yml @@ -7,8 +7,23 @@ on: branches: [master] jobs: + upload-package-lock-json: + name: Upload package-lock.json from this repo + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4.1.1 + + - name: Upload package-lock.json + uses: actions/upload-artifact@v4 + with: + name: package-lock.json + path: package-lock.json + build-and-deploy: - uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v1.0.0 + name: Build and Deploy + needs: upload-package-lock-json + uses: clearlydefined/operations/.github/workflows/app-build-and-deploy.yml@v2.0.0 secrets: AZURE_CREDENTIALS: ${{ secrets.AZURE_CREDENTIALS }} AZURE_WEBAPP_PUBLISH_PROFILE: ${{ secrets.AZURE_WEBAPP_PUBLISH_PROFILE_DEV }} @@ -19,3 +34,5 @@ jobs: application-type: ui azure-app-base-name: clearlydefined azure-app-name-postfix: -dev + docker-build-args: | + REACT_APP_SERVER="https://dev.clearlydefined.io" From ce47ee175b1385eba4e840fe84fc35bcac670ce3 Mon Sep 17 00:00:00 2001 From: "E. Lynette Rayle" Date: Thu, 11 Jul 2024 17:09:52 -0400 Subject: [PATCH 2/2] add in tracking id --- .github/workflows/build-and-deploy-dev.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy-dev.yml b/.github/workflows/build-and-deploy-dev.yml index 24d90ce3..5b0b5de1 100644 --- a/.github/workflows/build-and-deploy-dev.yml +++ b/.github/workflows/build-and-deploy-dev.yml @@ -35,4 +35,5 @@ jobs: azure-app-base-name: clearlydefined azure-app-name-postfix: -dev docker-build-args: | - REACT_APP_SERVER="https://dev.clearlydefined.io" + REACT_APP_SERVER="https://dev-api.clearlydefined.io" + REACT_APP_GA_TRACKINGID="${{ secrets.REACT_APP_GA_TRACKINGID_DEV }}"