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

Cherry pick style-spec build fixes from master #6603

Merged
merged 5 commits into from
May 3, 2018

Conversation

anandthakker
Copy link
Contributor

No description provided.

anandthakker and others added 5 commits May 3, 2018 11:30
Cherry pick 478dd56 from master

* Ensure style spec is published with build

Closes #6433
Closes #6574

* Consolidate build unit test commands

* Workaround CI image path bash/sh issue

mapbox/mbgl-ci-images#17
@anandthakker anandthakker requested a review from jfirebaugh May 3, 2018 15:40
@anandthakker
Copy link
Contributor Author

Had to resolve a couple conflicts due to #6513 not being present on release-0.45.

@@ -1,7 +1,6 @@
/rollup/build/
/docs/components/api.json
/dist/mapbox-gl-dev.js
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't this change tied to #6513?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I duplicated it here because the style-spec build changes also introduce new stuff into dist/

@anandthakker anandthakker merged commit 3bd1803 into release-0.45 May 3, 2018
@anandthakker anandthakker deleted the cp-style-spec-build branch May 3, 2018 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants