Merge remote-tracking branch 'origin' into cesium.com

Author: Jeshurun Hembd

.concierge/config.json

@@ -11,10 +11,10 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v4
-      - name: install node 20
+      - name: install node 22
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: install npm packages
         working-directory: ./.github/actions/check-for-CLA
         run: npm install

.concierge/templates/pullRequestOpened.hbs

@@ -1,7 +1,7 @@
 name: deploy
-on: 
+on:
   push:
-    branches-ignore: 
+    branches-ignore:
       - 'cesium.com'
       - production
 concurrency:
@@ -24,10 +24,10 @@ jobs:
       GITHUB_SHA: ${{ github.sha }}
     steps:
       - uses: actions/checkout@v4
-      - name: install node 20
+      - name: install node 22
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: npm install
         run: npm install
       - name: set the version in package.json
@@ -47,7 +47,6 @@ jobs:
           aws s3 sync . s3://cesium-public-builds/cesium/$BRANCH/ \
           --cache-control "no-cache" \
           --exclude ".git/*" \
-          --exclude ".concierge/*" \
           --exclude ".github/*" \
           --exclude ".husky/*" \
           --exclude ".vscode/*" \
@@ -58,7 +57,7 @@ jobs:
           --exclude "node_modules/*" \
           --exclude "scripts/*" \
           --exclude "Tools/*" \
-          --delete 
+          --delete
       - name: set status
         if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
         run: npm run deploy-status -- --status success --message Deployed

.concierge/templates/signature.hbs

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: install node 20
+      - name: install node 22
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: npm install
         run: npm install
       - name: lint *.js
@@ -33,10 +33,10 @@ jobs:
       BRANCH: ${{ github.ref_name }}
     steps:
       - uses: actions/checkout@v4
-      - name: install node 20
+      - name: install node 22
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: npm install
         run: npm install
       - name: build
@@ -50,10 +50,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: install node 20
+      - name: install node 22
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: npm install
         run: npm install
       - name: release build
@@ -78,10 +78,10 @@ jobs:
       GITHUB_SHA: ${{ github.sha }}
     steps:
       - uses: actions/checkout@v3
-      - name: install node 20
+      - name: install node 22
         uses: actions/setup-node@v3
         with:
-          node-version: '20'
+          node-version: '22'
       - name: npm install
         run: npm install
       - name: set the version in package.json
@@ -116,14 +116,14 @@ jobs:
       - name: set status
         if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
         run: npm run deploy-status -- --status success --message Deployed
-  node-18:
+  node-20:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: install node 18
+      - name: install node 20
         uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
       - name: npm install
         run: npm install
       - name: release build

.github/workflows/cla.yml

@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: install node 20
+      - name: install node 22
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: npm install
         run: npm install
       - name: lint *.js
@@ -33,10 +33,10 @@ jobs:
       GITHUB_SHA: ${{ github.sha }}
     steps:
       - uses: actions/checkout@v4
-      - name: install node 20
+      - name: install node 22
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: npm install
         run: npm install
       - name: build website release

.github/workflows/deploy.yml

@@ -13,6 +13,7 @@ Thumbs.db
 /Apps/Sandcastle/jsHintOptions.js
 /Apps/Sandcastle/gallery/gallery-index.js
 /Apps/Sandcastle/templates/bucket.css
+/Apps/Sandcastle2
 
 /Source/Assets/
 /Source/**/*.d.ts
@@ -43,4 +44,4 @@ yarn.lock
 .idea/shelf
 
 # Used in the CLA checking GitHub workflow
-GoogleConfig.json
+GoogleConfig.json

.github/workflows/dev.yml

@@ -1,4 +1,3 @@
-/.concierge
 /.eslintcache
 /.externalToolBuilders
 /.gitattributes