Merge pull request #1058 from clearlydefined/elr/test-new-deploy

use v2.0.0 deploy & pass docker build args

Author: elrayle

.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,6 @@ jobs:
       application-type: ui
       azure-app-base-name: clearlydefined
       azure-app-name-postfix: -dev
+      docker-build-args: |
+        REACT_APP_SERVER="https://dev-api.clearlydefined.io"
+        REACT_APP_GA_TRACKINGID="${{ secrets.REACT_APP_GA_TRACKINGID_DEV }}"