Skip to content

Instantly share code, notes, and snippets.

@sjl
Last active December 14, 2015 04:59
Show Gist options
  • Save sjl/5032048 to your computer and use it in GitHub Desktop.
Save sjl/5032048 to your computer and use it in GitHub Desktop.

OK, so here's the deal. We need to:

  1. Re-run the tern migrations with the updated Babelsubs to perform the migrations with all the latest bugs fixed.

  2. Provide partners with a stable staging server to test the DMR on.

  3. Provide ourselves with a place to deploy changesets before they get to the stable staging server.

I think we should resurrect dev for a while and do the following:

  1. Move the staging ref in the git repo to point at the revision right before we merged in the old dev branch. This means it will be in the "pre-DMR, ready to run tern" state.

  2. From then on, no one commits to staging.

  3. Resurrect dev, pointing the dev ref at the latest commit in our repo. Any and all commits should go onto dev. Dev will be deployed by Jenkins as it was before.

  4. Once Tern finishes, we make sure to get dev to a stable state, and then merge it into staging once again. This should be easy since I did the main merge before, so there shouldn't be any extra changesets to worry about.

  5. Partners start to test on staging.

  6. We continue to work on dev, merging it into staging whenever we feel it's stable enough.

Does this sound right?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment