Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unify cesium.com deploy #10839

Merged
merged 6 commits into from
Oct 6, 2022
Merged

Unify cesium.com deploy #10839

merged 6 commits into from
Oct 6, 2022

Conversation

ggetz
Copy link
Contributor

@ggetz ggetz commented Oct 5, 2022

We currently have a fair amount of deploy code that lives only in the cesium.com branch. The cesium.com branch is the "production" branch; When we push to it as part of the release process, travis CI will deploy files to the website for use in Sandcastle, documentation, cesium viewer, and a list of releases.

However, due to this separate deployment code across branches, it can become a chore to merge in main given any updates to .travis.yml or the gulpfile such as when updating dev packages. This PR seeks to unify the logic as much as possible, pulling in the custom deploy logic from that branch and conditionally running it based on Travis environment variables.

You can test the "production" paths locally by setting a local TRAVIS_BRANCH environment variable to "cesium.com"

  • Unified .travis.yml, moving any complex logic to a script, as recommended per the travis CI documentation
  • Fixes cesium.com branch of CesiumJS fails in CI due to token #10267 by disabling tests for the cesium.com branch
  • Remove redundant build steps in the cesium.com branch
  • Renamed scripts to travis to be consistant with our other repos
  • Updated gulpfile.js such that it should be the same in both branches. There are now conditional paths where the differences were, which are run only in travis when the branch name matches cesium.com.
@cesium-concierge
Copy link

Thanks for the pull request @ggetz!

  • ✔️ Signed CLA found.
  • CHANGES.md was not updated.
    • If this change updates the public API in any way, please add a bullet point to CHANGES.md.
  • ❔ Unit tests were not updated.
    • Make sure you've updated tests to reflect your changes, added tests for any new code, and ran the code coverage tool.

Reviewers, don't forget to make sure that:

  • Cesium Viewer works.
  • Works in 2D/CV.
Copy link
Contributor

@sanjeetsuhag sanjeetsuhag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ggetz, this will be a great QoL change around release time.

gulpfile.js Show resolved Hide resolved
travis/release.sh Outdated Show resolved Hide resolved
gulpfile.js Outdated Show resolved Hide resolved
travis/prepare.sh Outdated Show resolved Hide resolved
@ggetz
Copy link
Contributor Author

ggetz commented Oct 6, 2022

Thanks @sanjeetsuhag! This should be ready fro another look.

@sanjeetsuhag
Copy link
Contributor

@ggetz When running locally, the built version of CesiumViewer loads, but cannot correctly load all static assets.

@ggetz
Copy link
Contributor Author

ggetz commented Oct 6, 2022

Good catch @sanjeetsuhag-

build-apps does require that you build the minified/release version of Cesium first, such as with make-zip, and copies the static assets from Build/Cesium. This mean that the copied static files, such a Worker files, are minified. However, I believe this is also how it is in main and is not unique to this branch.

Copy link
Contributor

@sanjeetsuhag sanjeetsuhag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks @ggetz!

@sanjeetsuhag sanjeetsuhag merged commit 2f4aeb8 into main Oct 6, 2022
@sanjeetsuhag sanjeetsuhag deleted the unify-cesium.com-deploy branch October 6, 2022 16:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants