Skip to content

Commit 5f8dda9

Browse files
author
njrivera
authored
Revert "update with current cesium (#1)" (#2)
This reverts commit 5e4ef8c.
1 parent 5e4ef8c commit 5f8dda9

File tree

1,852 files changed

+51833
-153793
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,852 files changed

+51833
-153793
lines changed

.appveyor.yml

-20
This file was deleted.

.concierge/config.json

-5
This file was deleted.
+14-34
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,24 @@
1-
{{#if askAboutContributors}}
2-
Thank you so much for the pull request @{{ userName }}! I noticed this is your first pull request and I wanted to say welcome to the Cesium community!
1+
{{#if claEnabled}}
2+
{{#if askForCla}}
3+
[![Please sign the CLA before we review this PR.](https://img.shields.io/badge/CLA-required-red.svg)](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla)
34

4-
The [Pull Request Guidelines](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#pull-request-guidelines) is a handy reference for making sure your PR gets accepted quickly, so make sure to skim that.
5+
Welcome to the Cesium community @{{ userName }}!
56

6-
* :x: Missing `CONTRIBUTORS.md` entry.
7-
* Please add yourself to the [contributors]({{ contributorsUrl }}) file!
7+
Can you please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) so that we can review and merge this pull request?
88
{{else}}
9-
Thanks for the pull request @{{ userName }}!
9+
![Signed CLA is on file.](https://img.shields.io/badge/CLA-signed-brightgreen.svg)
10+
11+
@{{ userName }}, thanks for the pull request! Maintainers, we have a signed CLA from @{{ userName }}, so you can review this at any time.
1012
{{/if}}
11-
{{#if claEnabled}}
12-
{{#if errorCla}}
13-
* :grey_exclamation: There was an error checking the CLA! If this is your first contribution, please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla).
14-
* Maintainers, this was the error I ran into while attempting to process the CLA check. Please resolve it to continue CLA checking.
15-
```
16-
{{ errorCla }}
17-
```
1813
{{else}}
19-
{{#if askForCla}}
20-
* :x: Missing CLA.
21-
* Please send in a [Contributor License Agreement](https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#contributor-license-agreement-cla) (CLA) and comment back here to let us know to check this!
22-
{{else}}
23-
* :heavy_check_mark: Signed CLA found.
24-
{{/if}}
25-
{{/if}}
14+
@{{ userName }}, thanks for the pull request!
2615
{{/if}}
16+
2717
{{#if askAboutChanges}}
28-
* :grey_question: [CHANGES.md]({{ repository_url }}/blob/{{ headBranch }}/CHANGES.md) was not updated.
29-
* If this change updates the public API in any way, please add a bullet point to `CHANGES.md`.
18+
:warning: I noticed that [CHANGES.md]({{ repository_url }}/blob/master/CHANGES.md) has not been updated. If this change updates the public API in any way, fixes a bug, or makes any non-trivial update, please add a bullet point to `CHANGES.md` and comment on this pull request so we know it was updated. For more info, see the [Pull Request Guidelines]( https://github.com/AnalyticalGraphicsInc/cesium/blob/master/CONTRIBUTING.md#pull-request-guidelines).
19+
3020
{{/if}}
3121
{{#if askAboutThirdParty}}
32-
* :grey_question: Changes to third party files were made.
33-
* Looks like a file in one of our ThirdParty folders (`{{ thirdPartyFolders }}`) has been added or modified. Please verify that it has a section in [LICENSE.md]({{ repository_url }}/blob/master/LICENSE.md) and that its license information is up to date with this new version.
34-
{{/if}}
35-
{{#if askAboutTests}}
36-
* :grey_question: Unit tests were not updated.
37-
* Make sure you've [updated tests](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/Documentation/Contributors/TestingGuide) to reflect your changes, added tests for any new code, and ran the code coverage tool.
38-
{{/if}}
39-
40-
Reviewers, don't forget to make sure that:
22+
:warning: I noticed that a file in one of our ThirdParty folders (`{{ thirdPartyFolders }}`) has been added or modified. Please verify that it has a section in [LICENSE.md]({{ repository_url }}/blob/master/LICENSE.md) and that its license information is up to date with this new version. Once you do, please confirm by commenting on this pull request.
4123

42-
- [ ] Cesium Viewer works.
43-
- [ ] Works in 2D/CV.
44-
- [ ] Works (or fails gracefully) in IE11.
24+
{{/if}}

.concierge/templates/signature.hbs

+4
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1+
---
12
3+
__I am a bot who helps you make Cesium awesome! [Contributions to my configuration are welcome.](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/.concierge)__
4+
5+
:earth_africa: :earth_americas: :earth_asia:

.eslintignore

-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ Apps/HelloWorld.html
22
Apps/Sandcastle/ThirdParty/**
33
Build/**
44
Documentation/**
5-
Instrumented/**
65
Source/Shaders/**
76
Source/ThirdParty/**
87
Source/Workers/cesiumWorkerBootstrapper.js
98
ThirdParty/**
109
Tools/**
11-
Apps/Sandcastle/jsHintOptions.js
12-
Apps/Sandcastle/gallery/gallery-index.js

.github/ISSUE_TEMPLATE.md

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Thanks for contributing to the Cesium Community!
2+
3+
If you have a question, please search the forum:
4+
5+
http://cesiumjs.org/forum.html
6+
7+
and start a new forum thread, if needed, instead of creating this issue.
8+
9+
Otherwise, we look forward to your bug report or feature request in this issue.
10+
11+
---
12+
13+
Delete this message before clicking Submit.

.github/ISSUE_TEMPLATE/bug_report.md

-28
This file was deleted.

.github/ISSUE_TEMPLATE/feature_request.md

-14
This file was deleted.

.github/ISSUE_TEMPLATE/question.md

-6
This file was deleted.

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Thumbs.db
1111

1212
/Apps/Sandcastle/jsHintOptions.js
1313
/Apps/Sandcastle/gallery/gallery-index.js
14-
/Apps/Sandcastle/templates/bucket.css
1514

1615
/Source/Cesium.js
1716

.idea/codeStyles/Project.xml

-19
This file was deleted.

.idea/codeStyles/codeStyleConfig.xml

-5
This file was deleted.

.idea/inspectionProfiles/profiles_settings.xml

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations/Run_tests.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.slackbot.yml

-15
This file was deleted.

.travis.yml

+33-30
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,39 @@ language: node_js
22
node_js:
33
- "8"
44
sudo: false
5-
addons:
6-
chrome: stable
7-
firefox: latest
8-
services:
9-
- xvfb
105
before_script:
116
- export DISPLAY=:99.0
7+
- sh -e /etc/init.d/xvfb start
128
script:
13-
- npm --silent run deploy-set-version -- --buildVersion $TRAVIS_BRANCH.$TRAVIS_BUILD_NUMBER
14-
- npm --silent run deploy-status -- --status pending --message 'Waiting for build'
15-
16-
- npm --silent run eslint
17-
18-
- npm --silent run build
19-
- npm --silent run test -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed
20-
21-
- npm --silent run clean
22-
- travis_wait 20 npm --silent run makeZipFile -- --concurrency 1
23-
- npm pack &> /dev/null
24-
25-
- npm --silent run buildApps
26-
27-
- npm --silent run deploy-s3 -- -b cesium-dev -d cesium/$TRAVIS_BRANCH --confirm -c 'no-cache'
28-
- npm --silent run deploy-status -- --status success --message Deployed
29-
30-
- npm --silent run test -- --browsers FirefoxHeadless --failTaskOnError --webgl-stub --release --suppressPassed
31-
32-
# Various Node.js smoke-screen tests
33-
- node -e "const Cesium = require('./');"
34-
- NODE_ENV=development node index.js
35-
- NODE_ENV=production node index.js
36-
37-
- npm --silent run cloc
9+
- echo 'deployPending' && echo -en 'travis_fold:start:script.deployPending\\r'
10+
- npm run deploy-set-version -- --version $TRAVIS_BRANCH.$TRAVIS_BUILD_NUMBER
11+
- npm run deploy-status -- --status pending --message 'Waiting for build'
12+
- echo -en 'travis_fold:end:script.deployPending\\r'
13+
14+
- echo 'eslint' && echo -en 'travis_fold:start:script.eslint\\r'
15+
- npm run eslint
16+
- echo -en 'travis_fold:end:script.eslint\\r'
17+
18+
- echo 'test webgl-stub' && echo -en 'travis_fold:start:script.test\\r'
19+
- npm run build
20+
- npm run test -- --browsers Electron --webgl-stub --failTaskOnError --suppressPassed
21+
- echo -en 'travis_fold:end:script.test\\r'
22+
23+
- echo 'makeZipFile' && echo -en 'travis_fold:start:script.makeZipFile\\r'
24+
- npm run clean
25+
- npm run makeZipFile -- --concurrency 2
26+
- npm pack
27+
- echo -en 'travis_fold:end:script.makeZipFile\\r'
28+
29+
- echo 'deploy' && echo -en 'travis_fold:start:script.deploy\\r'
30+
- npm run deploy-s3 -- -b cesium-dev -d cesium/$TRAVIS_BRANCH --confirm -c 'no-cache'
31+
- npm run deploy-status -- --status success --message Deployed
32+
- echo -en 'travis_fold:end:script.deploy\\r'
33+
34+
- echo 'test webgl-stub release' && echo -en 'travis_fold:start:script test.release\\r'
35+
- npm run test -- --browsers Electron --failTaskOnError --webgl-stub --release --suppressPassed
36+
- echo -en 'travis_fold:end:script test.release\\r'
37+
38+
- echo 'cloc' && echo -en 'travis_fold:start:script.cloc\\r'
39+
- npm run cloc
40+
- echo -en 'travis_fold:end:script.cloc\\r'

.vscode/extensions.json

-7
This file was deleted.

.vscode/settings.json

+12-10
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66
"**/Thumbs.db": true,
77
".idea": true,
88
".metadata": true,
9-
".settings": true,
10-
".externalToolBuilders": true,
11-
".project": true,
12-
"launches": true
13-
},
14-
"search.exclude": {
159
"Build": true,
1610
"Instrumented": true,
1711
"node_modules": true,
18-
"Source/Shaders/**/*.js": true
19-
},
20-
"files.associations": {
21-
"*.czml": "json"
12+
".settings": true,
13+
".externalToolBuilders": true,
14+
".project": true,
15+
"launches": true,
16+
"Cesium-*.zip": true,
17+
"cesium-*.tgz": true,
18+
"Apps/Sandcastle/jsHintOptions.js": true,
19+
"Apps/Sandcastle/gallery/gallery-index.js": true,
20+
"Source/Cesium.js": true,
21+
"Source/Shaders/**/*.js": true,
22+
"Specs/SpecList.js": true,
23+
"npm-debug.log": true
2224
},
2325
"files.trimTrailingWhitespace": true,
2426
"files.insertFinalNewline": true,

0 commit comments

Comments
 (0)