Skip to content
This repository was archived by the owner on Aug 8, 2023. It is now read-only.

Move mapbox/mapbox-gl-styles to mb-pages branch - #1910

Merged
incanus merged 1 commit into
masterfrom
1ec5-styles-mb-pages
Jul 23, 2015
Merged

Move mapbox/mapbox-gl-styles to mb-pages branch#1910
incanus merged 1 commit into
masterfrom
1ec5-styles-mb-pages

Conversation

@1ec5

@1ec5 1ec5 commented Jul 21, 2015

Copy link
Copy Markdown
Contributor

The ios-b1 branch of mapbox/mapbox-gl-styles is getting further and further behind mb-pages, as one would expect. The main reason we’re using a branch is so that we don’t end up bundling old versions of styles with Mapbox GL. This PR moves the submodule pin to mb-pages and causes the package script to filter to just the desired styles. It assumes that we’ll be on the lookout for any post-0.3.0 regressions in the stylesheets that have never shipped with Mapbox GL before.

(An alternative fix would be to restructure the mapbox/mapbox-gl-styles repository so that each -v* would be its own branch. That is, a v7 branch would contain mapbox-streets.json, emerald.json, etc. Then Mapbox GL could pull in just the v7 branch’s JSON files.)

/cc @incanus @bleege @nickidlugash @peterqliu @andreasviglakis @samanpwbb

When packaging, filter to just the desired styles.
@1ec5 1ec5 added the refactor label Jul 21, 2015
@1ec5 1ec5 self-assigned this Jul 21, 2015
incanus added a commit that referenced this pull request Jul 23, 2015
Move mapbox/mapbox-gl-styles to mb-pages branch
@incanus
incanus merged commit 4518059 into master Jul 23, 2015
@incanus
incanus deleted the 1ec5-styles-mb-pages branch July 23, 2015 01:02
@peterqliu

Copy link
Copy Markdown
Contributor

Emerald looks good so far 👍

AndwareSsj pushed a commit to AndwareSsj/mapbox-gl-native that referenced this pull request Nov 6, 2015
Move mapbox/mapbox-gl-styles to mb-pages branch
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants