Skip to content

Commit

Permalink
Revert "update with current cesium (#1)" (#2)
Browse files Browse the repository at this point in the history
This reverts commit 5e4ef8c.
  • Loading branch information
njrivera authored Jul 16, 2019
1 parent 5e4ef8c commit 5f8dda9
Show file tree
Hide file tree
Showing 1,852 changed files with 51,833 additions and 153,793 deletions.
20 changes: 0 additions & 20 deletions .appveyor.yml

This file was deleted.

5 changes: 0 additions & 5 deletions .concierge/config.json

This file was deleted.

48 changes: 14 additions & 34 deletions .concierge/templates/pullRequestOpened.hbs
Original file line number Diff line number Diff line change
@@ -1,44 +1,24 @@
{{#if askAboutContributors}}
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!
{{#if claEnabled}}
{{#if askForCla}}
[![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)

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.
Welcome to the Cesium community @{{ userName }}!

* :x: Missing `CONTRIBUTORS.md` entry.
* Please add yourself to the [contributors]({{ contributorsUrl }}) file!
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?
{{else}}
Thanks for the pull request @{{ userName }}!
![Signed CLA is on file.](https://img.shields.io/badge/CLA-signed-brightgreen.svg)

@{{ userName }}, thanks for the pull request! Maintainers, we have a signed CLA from @{{ userName }}, so you can review this at any time.
{{/if}}
{{#if claEnabled}}
{{#if errorCla}}
* :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).
* Maintainers, this was the error I ran into while attempting to process the CLA check. Please resolve it to continue CLA checking.
```
{{ errorCla }}
```
{{else}}
{{#if askForCla}}
* :x: Missing CLA.
* 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!
{{else}}
* :heavy_check_mark: Signed CLA found.
{{/if}}
{{/if}}
@{{ userName }}, thanks for the pull request!
{{/if}}

{{#if askAboutChanges}}
* :grey_question: [CHANGES.md]({{ repository_url }}/blob/{{ headBranch }}/CHANGES.md) was not updated.
* If this change updates the public API in any way, please add a bullet point to `CHANGES.md`.
: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).

{{/if}}
{{#if askAboutThirdParty}}
* :grey_question: Changes to third party files were made.
* 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.
{{/if}}
{{#if askAboutTests}}
* :grey_question: Unit tests were not updated.
* 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.
{{/if}}

Reviewers, don't forget to make sure that:
: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.

- [ ] Cesium Viewer works.
- [ ] Works in 2D/CV.
- [ ] Works (or fails gracefully) in IE11.
{{/if}}
4 changes: 4 additions & 0 deletions .concierge/templates/signature.hbs
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
---
__I am a bot who helps you make Cesium awesome! [Contributions to my configuration are welcome.](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/.concierge)__
:earth_africa: :earth_americas: :earth_asia:
3 changes: 0 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ Apps/HelloWorld.html
Apps/Sandcastle/ThirdParty/**
Build/**
Documentation/**
Instrumented/**
Source/Shaders/**
Source/ThirdParty/**
Source/Workers/cesiumWorkerBootstrapper.js
ThirdParty/**
Tools/**
Apps/Sandcastle/jsHintOptions.js
Apps/Sandcastle/gallery/gallery-index.js
13 changes: 13 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Thanks for contributing to the Cesium Community!

If you have a question, please search the forum:

http://cesiumjs.org/forum.html

and start a new forum thread, if needed, instead of creating this issue.

Otherwise, we look forward to your bug report or feature request in this issue.

---

Delete this message before clicking Submit.
28 changes: 0 additions & 28 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

14 changes: 0 additions & 14 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

6 changes: 0 additions & 6 deletions .github/ISSUE_TEMPLATE/question.md

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ Thumbs.db

/Apps/Sandcastle/jsHintOptions.js
/Apps/Sandcastle/gallery/gallery-index.js
/Apps/Sandcastle/templates/bucket.css

/Source/Cesium.js

Expand Down
19 changes: 0 additions & 19 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

7 changes: 7 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Run_tests.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions .slackbot.yml

This file was deleted.

63 changes: 33 additions & 30 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,36 +2,39 @@ language: node_js
node_js:
- "8"
sudo: false
addons:
chrome: stable
firefox: latest
services:
- xvfb
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
script:
- npm --silent run deploy-set-version -- --buildVersion $TRAVIS_BRANCH.$TRAVIS_BUILD_NUMBER
- npm --silent run deploy-status -- --status pending --message 'Waiting for build'

- npm --silent run eslint

- npm --silent run build
- npm --silent run test -- --browsers FirefoxHeadless --webgl-stub --failTaskOnError --suppressPassed

- npm --silent run clean
- travis_wait 20 npm --silent run makeZipFile -- --concurrency 1
- npm pack &> /dev/null

- npm --silent run buildApps

- npm --silent run deploy-s3 -- -b cesium-dev -d cesium/$TRAVIS_BRANCH --confirm -c 'no-cache'
- npm --silent run deploy-status -- --status success --message Deployed

- npm --silent run test -- --browsers FirefoxHeadless --failTaskOnError --webgl-stub --release --suppressPassed

# Various Node.js smoke-screen tests
- node -e "const Cesium = require('./');"
- NODE_ENV=development node index.js
- NODE_ENV=production node index.js

- npm --silent run cloc
- echo 'deployPending' && echo -en 'travis_fold:start:script.deployPending\\r'
- npm run deploy-set-version -- --version $TRAVIS_BRANCH.$TRAVIS_BUILD_NUMBER
- npm run deploy-status -- --status pending --message 'Waiting for build'
- echo -en 'travis_fold:end:script.deployPending\\r'

- echo 'eslint' && echo -en 'travis_fold:start:script.eslint\\r'
- npm run eslint
- echo -en 'travis_fold:end:script.eslint\\r'

- echo 'test webgl-stub' && echo -en 'travis_fold:start:script.test\\r'
- npm run build
- npm run test -- --browsers Electron --webgl-stub --failTaskOnError --suppressPassed
- echo -en 'travis_fold:end:script.test\\r'

- echo 'makeZipFile' && echo -en 'travis_fold:start:script.makeZipFile\\r'
- npm run clean
- npm run makeZipFile -- --concurrency 2
- npm pack
- echo -en 'travis_fold:end:script.makeZipFile\\r'

- echo 'deploy' && echo -en 'travis_fold:start:script.deploy\\r'
- npm run deploy-s3 -- -b cesium-dev -d cesium/$TRAVIS_BRANCH --confirm -c 'no-cache'
- npm run deploy-status -- --status success --message Deployed
- echo -en 'travis_fold:end:script.deploy\\r'

- echo 'test webgl-stub release' && echo -en 'travis_fold:start:script test.release\\r'
- npm run test -- --browsers Electron --failTaskOnError --webgl-stub --release --suppressPassed
- echo -en 'travis_fold:end:script test.release\\r'

- echo 'cloc' && echo -en 'travis_fold:start:script.cloc\\r'
- npm run cloc
- echo -en 'travis_fold:end:script.cloc\\r'
7 changes: 0 additions & 7 deletions .vscode/extensions.json

This file was deleted.

22 changes: 12 additions & 10 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,21 @@
"**/Thumbs.db": true,
".idea": true,
".metadata": true,
".settings": true,
".externalToolBuilders": true,
".project": true,
"launches": true
},
"search.exclude": {
"Build": true,
"Instrumented": true,
"node_modules": true,
"Source/Shaders/**/*.js": true
},
"files.associations": {
"*.czml": "json"
".settings": true,
".externalToolBuilders": true,
".project": true,
"launches": true,
"Cesium-*.zip": true,
"cesium-*.tgz": true,
"Apps/Sandcastle/jsHintOptions.js": true,
"Apps/Sandcastle/gallery/gallery-index.js": true,
"Source/Cesium.js": true,
"Source/Shaders/**/*.js": true,
"Specs/SpecList.js": true,
"npm-debug.log": true
},
"files.trimTrailingWhitespace": true,
"files.insertFinalNewline": true,
Expand Down
Loading

0 comments on commit 5f8dda9

Please sign in to comment.