Update CLI release workflow

edgedb / rfcs

RFCs for major changes to EdgeDB

Apache License 2.0

35 stars 5 forks source link

Update CLI release workflow #68

Closed tailhook closed 1 year ago

tailhook commented 1 year ago

We don't do releases/ branch
On the other hand we do stable/2.2.x branch
Also uses more explicit tag and branch names. I think it's better in release flow, so that you don't accidentally push anything extra.
Other minor changes

tailhook commented 1 year ago

Thing I'm not sure about is how do we maintain stable/2.x branch:

Should we do git push +stable/2.2.x:stable/2.x (i.e. force push to replace branch)?
Or should we do the merge?
Or should we do git merge -s ours to avoid conflicts but maintain history and pull'ability of the branch?

elprans commented 1 year ago

Thing I'm not sure about is how do we maintain stable/2.x branch:

We cherry-pick commits normally.

tailhook commented 1 year ago

Thing I'm not sure about is how do we maintain stable/2.x branch:

We cherry-pick commits normally.

We cherry-pick to 2.1.x and 2.2.x. But 2.x should point to one of those branches. We never do the release from that branch so it makes no sense for it to diverge from 2.2.x (or whatever current minor version is for that major one).