Merge branch 'ZeLonewolf:main' into aaroads

.github/workflows/build-preview.yml

@@ -38,10 +38,10 @@ jobs:
           echo "EOF" >> $GITHUB_ENV
       - name: Checkout PR Branch 🛎️
         uses: actions/checkout@v3
-      - name: Use Node.js 18.16.1
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.16.1 #18.17.0 is buggy
+          node-version: 18.x
       - name: Install and Build 🔧
         # TODO: when we move shieldlib to its own repo, move shieldlib docs CI also
         run: |

.github/workflows/deploy-pr-checks.yml

@@ -98,13 +98,15 @@ jobs:
           interval: 500
       - name: Generate Preview text
         run: |
-          echo "## PR Preview:
+          echo "## Live PR Preview:
           * [Map](https://preview.ourmap.us/pr/${{ env.PR_NUM }}/)
           * [Shield Test](https://preview.ourmap.us/pr/${{ env.PR_NUM }}/shieldtest.html)
           * [style.json](https://preview.ourmap.us/pr/${{ env.PR_NUM }}/style.json)
           * [shields.json](https://preview.ourmap.us/pr/${{ env.PR_NUM }}/shields.json)
           * [taginfo.json](https://preview.ourmap.us/pr/${{ env.PR_NUM }}/taginfo.json)
 
+          Live previews are automatically removed once the PR is merged.
+
           ## Sprite Sheets:
 
           <img src="https://preview.ourmap.us/pr/${{ env.PR_NUM }}/sprites/sprite.png" />

.github/workflows/deploy.yml

@@ -20,10 +20,10 @@ jobs:
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v3
-      - name: Use Node.js 18.16.1
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.16.1 #18.17.0 is buggy
+          node-version: 18.x
       - name: Install and Build 🔧
         # TODO: when we move shieldlib to its own repo, move shieldlib docs CI also
         run: |

.github/workflows/s3-cleanup.yml

@@ -0,0 +1,27 @@
+name: Delete S3 Files on PR Merged
+
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  delete-s3-files:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up AWS CLI
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.AWS_REGION }}
+
+      - name: Remove files from S3
+        run: |
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          aws s3 rm s3://${{ secrets.AWS_S3_BUCKET }}/pr/${PR_NUMBER}/ --recursive

.github/workflows/test-build-mac.yml

@@ -10,13 +10,10 @@ jobs:
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v3
-      # Node v18.17.0, introduced July 18, 2023, introduces an error in unicode processing that breaks test cases on Ubuntu.
-      # See PR #905 and #908 for more details.
-      # If this bug is resolved in node, these lines can revert to 18.x rather than 18.16.0.
-      - name: Use Node.js 18.16.1
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.16.1
+          node-version: 18.x
       - name: Build Shield Library 🛡️
         run: |
           cd shieldlib

.github/workflows/test-build-ubuntu.yml

@@ -10,13 +10,10 @@ jobs:
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v3
-      # Node v18.17.0, introduced July 18, 2023, introduces an error in unicode processing that breaks test cases on Ubuntu.
-      # See PR #905 and #908 for more details.
-      # If this bug is resolved in node, these lines can revert to 18.x rather than 18.16.1.
-      - name: Use Node.js 18.16.1
+      - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.16.1
+          node-version: 18.x
       - name: Build Shield Library 🛡️
         run: |
           cd shieldlib

package.json

@@ -77,6 +77,6 @@
   },
   "engines": {
     "npm": ">=8.3.0",
-    "node": ">=14"
+    "node": ">=16"
   }
 }