Closed rnystrom closed 7 years ago
@Sherlouk @zhubofei feel free to jump on any of these w/ PRs if you want 💪🤓
lol - sorry I'm behind on this.
Those steps don't work with our new workflow.
Some notes:
We can't merge master
into stable
because it has 3.0
commits in it.
We (I) have been cherry-picking into stable -- which I'm not convinced was a great idea because it creates new commits. So we'll never be 0 | 0
, unless we merge stable
into master
but I'm not sure what that will actually do regarding history.
We'll need to gen docs on stable
and then PR that into master
since gh-pages only works via master/docs
.
I think we should update our future workflow to be:
stable
first (for example, anything for 2.x
)stable
into master
master
(for example, 3.0
changes)This way, master
will always be N
ahead of stable
but 0
behind. Then for the next major release (e.g. 3.0
) we can simply merge master
into stable
and everything should be in sync at 0 | 0
.
Ok. Branches are synced up via cherry-picking.
Picked 12 commits from master to stable: https://github.com/Instagram/IGListKit/branches
Compare list of commits:
@jessesquires so if we had 3.0.0 stuff done before 2.2.0 was released, we would just hold the PR in limbo until 2.2 is out, then land?
No no:
master
stable
Then we PR from stable
to master
. This would keep history clean.
Oh! I get it. I like that idea a lot.
Drafted the version on GH: https://github.com/Instagram/IGListKit/releases/tag/untagged-a3de6033bf518248eace
Will jump on version bump (Podspec etc) now
Really when we come to doing releases, once the cherry-picking process has been done in order to get all the specific commits over into stable
, we should then no longer push commits to master
until the release is done.
Otherwise we're going to have to keep redoing that step with every PR, for example the recent changelog updates. It'd be better if we did that straight onto stable
and once all changes are done and release is published then just do a final stable
into master
PR to get everything across and ready for the next release!
@rnystrom @jessesquires We got an agreed branching strat yet? If so let's document it!
@jessesquires branch protections removed, should be able to move forward w/ 2.2
@rnystrom - yep, I'll see what I can do later today/tomorrow
Ok, our branches and sync strat messed things up a bit. We're going to abandon 2.2 and push harder to get 3.0 out the door soon-ish. Apologies!
Booking keeping is all done.
For anyone waiting on the 2.2 release -- sorry for the confusion and hiccups! Hopefully we can get 3.0 out sooner.
Launch Checklist
master
pod install
on examplesmaster
againststable
with latest commitstable
is0|0
ahead/behind$ pod spec lint
locally and with CI$ pod trunk push IGListKit.podspec
$ pod install
on hobby weather app to see update