This repository has been archived by the owner on Aug 8, 2023. It is now read-only.
Clarify (and streamline?) workflow for coordinating changes with mapbox-gl-js #8082
Labels
Core
The cross-platform C++ core, aka mbgl
When working on a change in this repo that depends on a change to
mapbox-gl-js
(shaders, integration tests, style spec) -- e.g., #7944 -- I'm finding the flow for management to be a bit clunky. Here's what I am doing now:mapbox-gl-js
with the changes needed there. (Example: [not ready] Enable DDS for text-{field,transform} in gl-native mapbox-gl-js#4212 un-skips the integration tests relevant to enabling DDS for text-field, text-transform.)mapbox-gl-native/master
andmapbox-gl-js/master
may continue to move along, including the possibility that-native/master
needs to track updates ingl-js/master
. So, from time to time, rebase the branch in step 1) and then the PR branch here.mapbox-gl-native/master
. Then merge the dependent PR tomapbox-gl-js/master
, but don't delete the branch. Now, put in a new change to -native, updating the submodule tomapbox-gl-js/master
. Once it's merged, delete the lingering gl-js branch.Note that the situation in step 3 is the reason that we have to keep the gl-js branch separate while work is in progress: merging it into
gl-js/master
ahead of time would break things for anyone else developing on -native who needed to pull in some other update to gl-js.As best I can tell, this three-PRs-for-the-price-of-one thing is necessary, but I'm wondering if maybe I've missed something. If it is necessary, that's fine -- it's not like it's actually much extra work... but I do think it's weird/finicky enough to be error-prone, so we should document the process.
The text was updated successfully, but these errors were encountered: