Skip to content

Commit d8dbe05

Browse files
authored
Merge branch 'main' into gallery-build-path-fix
2 parents 71f2a97 + b2ba066 commit d8dbe05

File tree

59 files changed

+740
-1281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+740
-1281
lines changed

.github/workflows/cla.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v5
1414
- name: install node 22
15-
uses: actions/setup-node@v4
15+
uses: actions/setup-node@v5
1616
with:
1717
node-version: '22'
1818
- name: install npm packages

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828
- uses: actions/checkout@v5
2929
- name: install node 22
30-
uses: actions/setup-node@v4
30+
uses: actions/setup-node@v5
3131
with:
3232
node-version: '22'
3333
- name: npm install

.github/workflows/dev.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v5
1515
- name: install node 22
16-
uses: actions/setup-node@v4
16+
uses: actions/setup-node@v5
1717
with:
1818
node-version: '22'
1919
- name: npm install
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v5
3636
- name: install node 22
37-
uses: actions/setup-node@v4
37+
uses: actions/setup-node@v5
3838
with:
3939
node-version: '22'
4040
- name: npm install
@@ -51,7 +51,7 @@ jobs:
5151
steps:
5252
- uses: actions/checkout@v5
5353
- name: install node 22
54-
uses: actions/setup-node@v4
54+
uses: actions/setup-node@v5
5555
with:
5656
node-version: '22'
5757
- name: npm install
@@ -67,7 +67,7 @@ jobs:
6767
steps:
6868
- uses: actions/checkout@v5
6969
- name: install node 20
70-
uses: actions/setup-node@v4
70+
uses: actions/setup-node@v5
7171
with:
7272
node-version: '20'
7373
- name: npm install

.github/workflows/prod.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
steps:
1010
- uses: actions/checkout@v5
1111
- name: install node 22
12-
uses: actions/setup-node@v4
12+
uses: actions/setup-node@v5
1313
with:
1414
node-version: '22'
1515
- name: npm install
@@ -34,7 +34,7 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v5
3636
- name: install node 22
37-
uses: actions/setup-node@v4
37+
uses: actions/setup-node@v5
3838
with:
3939
node-version: '22'
4040
- name: npm install

.github/workflows/sandcastle-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v5
2020
- name: install node 22
21-
uses: actions/setup-node@v4
21+
uses: actions/setup-node@v5
2222
with:
2323
node-version: '22'
2424
- name: npm install

CHANGES.md

Lines changed: 1 addition & 0 deletions

CONTRIBUTORS.md

Lines changed: 1 addition & 0 deletions

Specs/Data/CesiumTerrainTileJson/9_759_335/9_759_335.terrain renamed to Specs/Data/CesiumTerrainTileJson/CesiumWorldTerrainSample/9/759/335.terrain

File renamed without changes.

Specs/Data/CesiumTerrainTileJson/9_759_335/layer.json renamed to Specs/Data/CesiumTerrainTileJson/CesiumWorldTerrainSample/layer.json

File renamed without changes.

Specs/Data/CesiumTerrainTileJson/EmptyTilesArray.tile.json renamed to Specs/Data/CesiumTerrainTileJson/EmptyTilesArray/layer.json

File renamed without changes.

0 commit comments

Comments
 (0)