Merge branch 'master' into docs/folder-path-issues

IDEMSInternational · Sep 12, 2024 · 00797a9 · 00797a9
2 parents fbf68b6 + 091b3a6
commit 00797a9
Show file tree

Hide file tree

Showing 22 changed files with 39 additions and 36 deletions.
diff --git a/.github/workflows/deprecated/build-and-upload.yml b/.github/workflows/deprecated/build-and-upload.yml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16]
+        node-version: [20]
 
     steps:
       - name: Install crcmod

diff --git a/.github/workflows/deprecated/deployment-hosting.yml b/.github/workflows/deprecated/deployment-hosting.yml
@@ -34,7 +34,7 @@ jobs:
           echo "DEPLOYMENT_NAME=${{needs.build.outputs.DEPLOYMENT_NAME}}" >> $GITHUB_ENV
           echo "GIT_SHA=${{needs.build.outputs.GIT_SHA}}" >> $GITHUB_ENV
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: www
       - name: Extract Build folder
@@ -52,7 +52,7 @@ jobs:
           SENTRY_PROJECT: ${{env.DEPLOYMENT_NAME}}
         continue-on-error: true
       - name: Store sourcemaps artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sourcemaps-$GIT_SHA
           path: www/*.map
@@ -65,7 +65,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: www
       - name: Extract Build folder

diff --git a/.github/workflows/deprecated/pr-build.yml b/.github/workflows/deprecated/pr-build.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16]
+        node-version: [20]
 
     steps:
       - name: Get PR Number

diff --git a/.github/workflows/deprecated/sourcemaps-upload.yml b/.github/workflows/deprecated/sourcemaps-upload.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Node ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20.17.0
           cache: 'yarn'
       - name: Populate environment config
         env:
@@ -60,7 +60,7 @@ jobs:
           SENTRY_PROJECT: ${{env.DEPLOYMENT_NAME}}
         continue-on-error: true
       - name: Store sourcemaps artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: sourcemaps-$SHA_SHORT
           path: www/*.map

diff --git a/.github/workflows/deprecated/test-e2e.yml b/.github/workflows/deprecated/test-e2e.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Node ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20.17.0
           cache: 'yarn'
       - name: Populate firebaseConfig.ts
         env:

diff --git a/.github/workflows/documentation-lint.yml b/.github/workflows/documentation-lint.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20.17.0
           cache: 'yarn'      
       - run: yarn install --immutable
       - name: Spellcheck

diff --git a/.github/workflows/reusable-android-build.yml b/.github/workflows/reusable-android-build.yml
@@ -85,7 +85,7 @@ jobs:
         - name: Setup Node
           uses: actions/setup-node@v3
           with:
-            node-version: 18.x          
+            node-version: 20.17.0          
         - uses: actions/cache/restore@v3
           id: cache
           with:
@@ -104,7 +104,7 @@ jobs:
           run: yarn workflow android
 
         - name: Download Build Artifact
-          uses: actions/download-artifact@v3
+          uses: actions/download-artifact@v4
           with:
             name: www
 
@@ -134,7 +134,7 @@ jobs:
           run: ./gradlew :app:assembleDebug
 
         - name: Upload debug apk
-          uses: actions/upload-artifact@v3
+          uses: actions/upload-artifact@v4
           with:
             name: debug_apk
             path: android/app/build/outputs/apk/debug/app-debug.apk
@@ -155,7 +155,7 @@ jobs:
             keyPassword: ${{ env.KEY_PASSWORD }}
 
         - name: Upload release bundle
-          uses: actions/upload-artifact@v3
+          uses: actions/upload-artifact@v4
           with:
             name: release_bundle
             path: ${{steps.sign_aab.outputs.signedReleaseFile}}

diff --git a/.github/workflows/reusable-android-release.yml b/.github/workflows/reusable-android-release.yml
@@ -33,7 +33,7 @@ jobs:
 
         - name: Download Build Artifact
           id: download
-          uses: actions/download-artifact@v3
+          uses: actions/download-artifact@v4
           with:
             name: release_bundle
             path: ./

diff --git a/.github/workflows/reusable-app-build.yml b/.github/workflows/reusable-app-build.yml
@@ -83,7 +83,8 @@ jobs:
         - name: Setup Node
           uses: actions/setup-node@v4
           with:
-            node-version: 20.x
+            node-version: 20.17.0
+
 
       #############################################################################
       #         Node Modules

diff --git a/.github/workflows/reusable-appetize.yml b/.github/workflows/reusable-appetize.yml
@@ -42,7 +42,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: debug_apk
           path: ./

diff --git a/.github/workflows/reusable-content-sync.yml b/.github/workflows/reusable-content-sync.yml
@@ -75,7 +75,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.17.0
 
       - name: Cache node modules
         uses: actions/cache@v3

diff --git a/.github/workflows/reusable-deploy-pr-preview.yml b/.github/workflows/reusable-deploy-pr-preview.yml
@@ -45,7 +45,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: www
 

diff --git a/.github/workflows/reusable-deploy-web-preview.yml b/.github/workflows/reusable-deploy-web-preview.yml
@@ -45,6 +45,7 @@ jobs:
     uses: ./.github/workflows/reusable-app-build.yml
     secrets: inherit
 
+    # TODO - split post_build and deploy
   deploy:
     needs: build_action
     runs-on: ubuntu-latest
@@ -55,7 +56,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: www
 
@@ -64,6 +65,7 @@ jobs:
           mkdir www
           tar -xf artifact.tar --directory www
 
+      # TODO - use templated files
       # Create a .firebaserc file mapping any firebase deployment host targets (required if multi-host projects)
       # e.g. {"projects": {"default": "my_app"},"targets": {"my_app": {"hosting": {"my_app_dev":["my_app_dev"]} } }
       - name: Populate Firebase Targets

diff --git a/.github/workflows/test-preview.yml b/.github/workflows/test-preview.yml
@@ -29,7 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: www
       - name: Extract Build folder

diff --git a/.github/workflows/test-visual.yml b/.github/workflows/test-visual.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.17.0
       - uses: actions/cache/restore@v3
         id: cache
         with:
@@ -55,7 +55,7 @@ jobs:
       #         Download build
       #############################################################################
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: www
 
@@ -79,7 +79,7 @@ jobs:
 
       - name: Upload screenshots
         if: ${{inputs.generate}}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: screenshots-artifact # NOTE - must match SCREENSHOT_ARTIFACT_NAME in code
           path: packages/test-visual/output/screenshots
@@ -95,7 +95,7 @@ jobs:
 
       - name: Upload artifact
         if: ${{inputs.compare}}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-visual-diffs-artifact
           path: packages/test-visual/output/diffs
@@ -104,7 +104,7 @@ jobs:
 
       - name: Upload Text Outputs
         if: ${{inputs.compare}}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: text_output
           path: packages/test-visual/output/*.txt

diff --git a/.github/workflows/web-build.yml b/.github/workflows/web-build.yml
@@ -97,7 +97,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.17.0
 
       #############################################################################
       #         Node Modules
@@ -175,7 +175,7 @@ jobs:
         # Use github pages upload artifact action to compress and upload
       - name: Upload artifact
         if: ${{!inputs.skip-upload}}
-        uses: actions/upload-pages-artifact@v1.0.8
+        uses: actions/upload-pages-artifact@v3
         with:
           path: "www/"
           name: www

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v18
+v20
diff --git a/README.md b/README.md
@@ -14,8 +14,8 @@
 2. Download and install [Git LFS](https://git-lfs.github.com/)  
    This will be used to download any required binary assets, such as images or pdfs
 
-3. Download and install [Node](https://nodejs.org/en/download/) (choose v18.20.4)  
-   This is the programming language required to run the project
+3. Download and install [Node](https://nodejs.org/en/download/)   
+   This is the programming language required to run the project. We currently support any of the versions prefixed `v20.x.x` or `v18.x.x`
 
 4. Download and Install [Yarn](https://classic.yarnpkg.com/en/docs/install)  
    This manages all 3rd-party code dependencies

diff --git a/documentation/docs/index.md b/documentation/docs/index.md
@@ -8,8 +8,8 @@
 2. Download and install [Git LFS](https://git-lfs.github.com/)  
    This will be used to download any required binary assets, such as images or pdfs
 
-3. Download and install [Node](https://nodejs.org/en/download/) (choose v18.20.4)  
-   This is the programming language required to run the project
+3. Download and install [Node](https://nodejs.org/en/download/)   
+   This is the programming language required to run the project. We currently support any of the versions prefixed `v20.x.x` or `v18.x.x`
 
 4. Download and Install [Yarn](https://classic.yarnpkg.com/en/docs/install)  
    This manages all 3rd-party code dependencies

diff --git a/packages/actions/templates/app-build/template.yml b/packages/actions/templates/app-build/template.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.17.0
       - name: Cache node modules
         uses: actions/cache@v3
         with:
@@ -69,7 +69,7 @@ jobs:
 
         # Use github pages upload artifact action to compress and upload
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1.0.8
+        uses: actions/upload-pages-artifact@v3
         with:
           path: "www/"
           name: ${{inputs.artifact-name}}

diff --git a/packages/actions/templates/deploy-firebase/template.yml b/packages/actions/templates/deploy-firebase/template.yml
@@ -49,7 +49,7 @@ jobs:
       # Extract build artifact
       - uses: actions/checkout@v3
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: www
       - name: Extract Build folder

diff --git a/packages/actions/templates/pr-preview-firebase/template.yml b/packages/actions/templates/pr-preview-firebase/template.yml
@@ -50,7 +50,7 @@ jobs:
       # Extract build artifact
       - uses: actions/checkout@v3
       - name: Download Build Artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: www
       - name: Extract Build folder