Skip to content

Commit cdd77c7

Browse files
mzschwartz5mzschwartz5
committed
Merge remote-tracking branch 'origin' into async-material-constructor
2 parents 360fa59 + 027b635 commit cdd77c7

File tree

1,408 files changed

+73036
-999
lines changed

Some content is hidden

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

1,408 files changed

+73036
-999
lines changed

‎.github/actions/verify-package/script.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ cp cesium*.tgz ../test
1515
cp Specs/test.*js ../test
1616
cd ../test
1717

18-
npm install cesium*.tgz
18+
npm install cesium-engine*.tgz
19+
npm install cesium-widgets*.tgz
20+
npm install cesium-1.*.tgz
1921
NODE_ENV=development node test.cjs
2022
NODE_ENV=production node test.cjs
21-
node test.mjs
23+
node test.mjs

‎.github/workflows/cla.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
issues: write
1111
pull-requests: write
1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- name: install node 22
1515
uses: actions/setup-node@v4
1616
with:

‎.github/workflows/deploy.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ jobs:
2222
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2323
GITHUB_REPO: ${{ github.repository }}
2424
GITHUB_SHA: ${{ github.sha }}
25+
BASE_URL: /cesium/${{ github.ref_name }}/
26+
DEPLOYED_URL: https://ci-builds.cesium.com/cesium/${{ github.ref_name }}/
2527
steps:
26-
- uses: actions/checkout@v4
28+
- uses: actions/checkout@v5
2729
- name: install node 22
2830
uses: actions/setup-node@v4
2931
with:
@@ -40,6 +42,8 @@ jobs:
4042
run: npm pack --workspaces &> /dev/null
4143
- name: build apps
4244
run: npm run build-apps
45+
- name: build sandcastle v2
46+
run: npm run build-ci -w packages/sandcastle -- -l warn
4347
- uses: ./.github/actions/verify-package
4448
- name: deploy to s3
4549
if: ${{ env.AWS_ACCESS_KEY_ID != '' }}

‎.github/workflows/dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
lint:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
- name: install node 22
1616
uses: actions/setup-node@v4
1717
with:
@@ -32,7 +32,7 @@ jobs:
3232
AWS_REGION: us-east-1
3333
BRANCH: ${{ github.ref_name }}
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
- name: install node 22
3737
uses: actions/setup-node@v4
3838
with:
@@ -49,7 +49,7 @@ jobs:
4949
release-tests:
5050
runs-on: ubuntu-latest
5151
steps:
52-
- uses: actions/checkout@v4
52+
- uses: actions/checkout@v5
5353
- name: install node 22
5454
uses: actions/setup-node@v4
5555
with:
@@ -65,7 +65,7 @@ jobs:
6565
node-20:
6666
runs-on: ubuntu-latest
6767
steps:
68-
- uses: actions/checkout@v4
68+
- uses: actions/checkout@v5
6969
- name: install node 20
7070
uses: actions/setup-node@v4
7171
with:

‎.github/workflows/prod.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
lint:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- uses: actions/checkout@v5
1111
- name: install node 22
1212
uses: actions/setup-node@v4
1313
with:
@@ -32,7 +32,7 @@ jobs:
3232
GITHUB_REPO: ${{ github.repository }}
3333
GITHUB_SHA: ${{ github.sha }}
3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
- name: install node 22
3737
uses: actions/setup-node@v4
3838
with:

‎.github/workflows/sandcastle-dev.yml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: sandcastle-dev
2+
on:
3+
push:
4+
branches:
5+
- 'cesium.com'
6+
jobs:
7+
deploy:
8+
runs-on: ubuntu-latest
9+
env:
10+
PROD: true
11+
AWS_ACCESS_KEY_ID: ${{ secrets.PROD_AWS_ACCESS_KEY_ID }}
12+
AWS_SECRET_ACCESS_KEY: ${{ secrets.PROD_AWS_SECRET_ACCESS_KEY }}
13+
AWS_REGION: us-east-1
14+
BRANCH: ${{ github.ref_name }}
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
16+
GITHUB_REPO: ${{ github.repository }}
17+
GITHUB_SHA: ${{ github.sha }}
18+
steps:
19+
- uses: actions/checkout@v5
20+
- name: install node 22
21+
uses: actions/setup-node@v4
22+
with:
23+
node-version: '22'
24+
- name: npm install
25+
run: npm install
26+
- name: build website release
27+
run: npm run website-release
28+
- name: build types
29+
run: npm run build-ts
30+
- name: build prod sandcastle
31+
run: npm run build-prod -w packages/sandcastle -- -l warn
32+
- name: deploy to dev-sandcastle.cesium.com
33+
if: ${{ env.AWS_ACCESS_KEY_ID != '' }}
34+
run: |
35+
aws s3 sync Build/Sandcastle2/ s3://cesium-dev-sandcastle-website/ --cache-control "public, max-age=1800" --delete

‎.idea/codeStyles/Project.xml‎

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.markdownlintignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/node_modules
2+
packages/sandcastle/node_modules
23
/ThirdParty
34
/Tools/**
45

‎.prettierignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
!**/*.html
1919
!**/*.md
2020
!**/*.ts
21+
!**/*.tsx
2122

2223
# Re-ignore a few things caught above
2324

@@ -33,6 +34,9 @@ packages/widgets/Build/**
3334
packages/widgets/index.js
3435
packages/widgets/Source/ThirdParty/**
3536

37+
packages/sandcastle/node_modules/**
38+
Apps/Sandcastle2/**
39+
3640
Specs/jasmine/**
3741

3842
Apps/Sandcastle/ThirdParty

‎.vscode/launch.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"version": "0.2.0",
33
"configurations": [
4+
45
{
56
"type": "node",
67
"request": "launch",

0 commit comments

Comments
 (0)