Merge remote-tracking branch 'origin/main' into develop

Author: jbriones1

.github/workflows/deploy-to-branch.yml

@@ -22,18 +22,27 @@ jobs:
       - run: npm ci
       - run: npm run build --if-present
 
-      - name: Push build folder to `build` branch
+      - name: Preserve build output when moving branches
+        run: mv build ../build-tmp
+
+      - name: Switch to the build branch and clean it
+        run: |
+          # Based off the script `./scripts/deploy_to_branch.sh`
+          # The branch we are publishing to
+          git fetch origin build
+          git switch build
+          rm -rf *
+
+      - name: Copy the built files over to the root directory and push to `build`
         run: |
           # Set up a dummy user and email for identification purposes
+          cp -R ../build-tmp/* .
+          rm -f ./js/*.LICENSE.txt
+
+      - name: Commit and push
+        run: |
           git config --global user.name "${{ github.actor }}"
           git config --global user.email "${{ github.actor }}@user.noreply.github.com"
-          
-          # Checkout `build` and copy the files over
-          # Based off the script `./scripts/deploy_to_branch.sh`
-          git checkout build
-          git pull origin build
-          cp -R build/* .
-          rm -f js/*.LICENSE.txt
           git add .
           git commit -m "Updating `build` with PR#${{ github.event.pull_request.number }}: ${{ github.event.pull_request.title }}"
           git push origin build

.github/workflows/deploy-to-test.yml

@@ -1,4 +1,4 @@
-name: Builds and pushes the results to the `test` branch when a pull request is merged nto `develop`
+name: Builds and pushes the results to the `test` branch when a pull request is merged into `develop`
 
 on:
   pull_request:
@@ -22,18 +22,27 @@ jobs:
       - run: npm ci
       - run: npm run build --if-present
 
-      - name: Push build folder to `test` branch
+      - name: Preserve build output when moving branches
+        run: mv build ../build-tmp
+
+      - name: Switch to the build branch and clean it
+        run: |
+          # Based off the script `./scripts/deploy_to_branch.sh`
+          # The branch we are publishing to
+          git fetch origin test
+          git switch test
+          rm -rf *
+
+      - name: Copy the built files over to the root directory and push to `test`
         run: |
           # Set up a dummy user and email for identification purposes
+          cp -R ../build-tmp/* .
+          rm -f ./js/*.LICENSE.txt
+
+      - name: Commit and push
+        run: |
           git config --global user.name "${{ github.actor }}"
           git config --global user.email "${{ github.actor }}@user.noreply.github.com"
-          
-          # Checkout `build` and copy the files over
-          # Based off the script `./scripts/deploy_to_branch.sh`
-          git checkout test
-          git pull origin test
-          cp -R build/* .
-          rm -f js/*.LICENSE.txt
           git add .
           git commit -m "Updating `test` with PR#${{ github.event.pull_request.number }}: ${{ github.event.pull_request.title }}"
           git push origin test