Merge Prod Release into Master

.github/workflows/deploy-prod.yml

@@ -8,7 +8,7 @@ jobs:
   vtm-app:
     uses: ./.github/workflows/deploy.yml
     with:
-      branch: 'master'
+      branch: ${{ github.ref_name }}
       environment: 'prod'
       bucket: '.prod'
     secrets:

.github/workflows/deploy.yml

@@ -27,12 +27,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ inputs.branch }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: 'npm'
@@ -56,10 +56,10 @@ jobs:
         run: npm run build -- --configuration='deploy' --output-path='dist/'
 
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: VTM-App-build-output
-          path: dist/
+          path: dist/browser
 
   upload:
     needs: [build]
@@ -74,16 +74,16 @@ jobs:
           role-session-name: GHA-VTM-Secrets
 
       - name: Get secrets from AWS
-        uses: aws-actions/aws-secretsmanager-get-secrets@v1
+        uses: aws-actions/aws-secretsmanager-get-secrets@v2
         with:
           secret-ids: cvs-app-vtm/gha
           parse-json-secrets: true
 
       - name: Download Artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: VTM-App-build-output
-          path: dist/
+          path: dist/browser
 
       - name: Get AWS Credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -93,6 +93,6 @@ jobs:
           role-session-name: GHA-VTM-Upload
 
       - name: Upload App to S3
-        working-directory: dist/
+        working-directory: dist/browser
         run: aws s3 sync . s3://vtm${{ inputs.bucket }}.${{ env.CVS_APP_VTM_GHA_DOMAIN }}
 

.github/workflows/pr-checks.yml

@@ -12,58 +12,40 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.18.0]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: '.nvmrc'
           cache: 'npm'
       - name: Install dependencies
         run: npm ci --include=optional
       - name: Build
         run: npm run build --ignore-scripts -- --configuration production
 
   test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.18.0]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
+    runs-on:
+      - ARM64
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'npm'
+          node-version-file: '.nvmrc'
       - name: Install dependencies
         run: npm ci --include=optional
       - name: Run tests
         run: npm run test:workflow
 
   lint:
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.18.0]
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
-
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: '.nvmrc'
           cache: 'npm'
       - name: Install dependencies
         run: npm ci --include=optional
@@ -72,45 +54,12 @@ jobs:
 
   audit:
     runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [18.18.0]
     steps:
-      - uses: actions/checkout@v3
-      - name: Setup Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: ${{ matrix.node-version }}
+          node-version-file: '.nvmrc'
           cache: 'npm'
       - name: Run audit
         run: npm audit --audit-level=critical
-
-  scanner:
-    permissions:
-      id-token: write
-    runs-on: X64
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version-file: '.nvmrc'
-      - uses: aws-actions/configure-aws-credentials@v4
-        with:
-          role-to-assume: ${{ secrets.AWS_MGMT_ROLE }}
-          aws-region: ${{ secrets.DVSA_AWS_REGION }}
-          role-session-name: 'cvs-app-vtm'
-      - uses: aws-actions/aws-secretsmanager-get-secrets@v1
-        with: 
-          secret-ids: sonarqube-gha
-          parse-json-secrets: true
-      - name: Install dependencies
-        run: npm ci --include=optional
-      - name: Run SonarQube scanner
-        run: |
-          npm run sonar-scanner -- \
-          -Dsonar.host.url=${{ env.SONARQUBE_GHA_URL }} \
-          -Dsonar.token=${{ env.SONARQUBE_GHA_TOKEN }} \
-          -Dsonar.login=${{ env.SONARQUBE_GHA_TOKEN }} \
-          -Dsonar.projectName=${{ github.repository }} \
-          -Dsonar.projectVersion=1.0.${{ github.run_id }}

.github/workflows/sonar-scan.yml

@@ -0,0 +1,40 @@
+name: Sonar scan
+
+on:
+  push:
+    branches: [ 'develop' ]
+
+jobs:
+  scanner:
+    permissions:
+      id-token: write
+    runs-on: X64
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_MGMT_ROLE }}
+          aws-region: ${{ secrets.DVSA_AWS_REGION }}
+          role-session-name: 'cvs-app-vtm'
+
+      - uses: aws-actions/aws-secretsmanager-get-secrets@v2
+        with:
+          secret-ids: sonarqube-gha
+          parse-json-secrets: true
+
+      - name: Install dependencies
+        run: npm ci --include=optional
+
+      - name: Run SonarQube scanner
+        run: |
+          npm run sonar-scanner -- \
+          -Dsonar.host.url=${{ env.SONARQUBE_GHA_URL }} \
+          -Dsonar.token=${{ env.SONARQUBE_GHA_TOKEN }} \
+          -Dsonar.login=${{ env.SONARQUBE_GHA_TOKEN }} \
+          -Dsonar.projectName=${{ github.repository }} \
+          -Dsonar.projectVersion=1.0.${{ github.run_id }}

.gitignore

@@ -45,21 +45,12 @@ yarn-error.log
 testem.log
 /typings
 .reports/
-{}
 .scannerwork
 
 # System files
 .DS_Store
 Thumbs.db
 
-# Cypress
-cypress.env.json
-cypress/videos
-cypress/screenshots
-runner-results
-multi-reporter-config.json
-cypress/parallel-weights.json
-
 report.json
 # Sentry Config File
 .sentryclirc

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run security-checks
+npx lint-staged && npm run security-checks

.nvmrc

@@ -1 +1 @@
-18.18.0
+20.16.0