Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Edgecase in release process #4173

Closed
wemeetagain opened this issue Jun 17, 2022 · 3 comments · Fixed by #4180
Closed

Edgecase in release process #4173

wemeetagain opened this issue Jun 17, 2022 · 3 comments · Fixed by #4180

Comments

@wemeetagain
Copy link
Member

wemeetagain commented Jun 17, 2022

Is your feature request related to a problem? Please describe.

During the release of v0.38.1, some issues arose.

  • We wanted a stable release with sepolia config (PR Add Sepolia config #4164)
  • Add Sepolia config #4164 did not apply cleanly to stable, built off changes from other PRs
  • Cherry-picking Add Sepolia config #4164 onto stable (branch rc/v0.38.1) required fixing merge conflicts
  • Finishing the release process, we now cannot merge stable back to unstable due to merge conflicts - see Stable #4172
  • stable cannot be modified to fix the conflicts, it is ridiculous to modify unstable to fix the conflicts

Describe the solution you'd like

  • only merge stable to unstable on major / non-hotfix releases
@q9f
Copy link
Contributor

q9f commented Jun 20, 2022

We have discussed this before, I would not merge stable back into unstable. Just archive old release tracks.

@wemeetagain
Copy link
Member Author

We recently changed our release process specifically to address the shortcoming(?) that release tracks were not merged back into unstable. @dapplion

But if we don't merge back to unstable, we would just need to figure out / document how / when to bump the versions in package.jsons.
Current flow is:

  • create rc branch, bump package.json versions there (eg: v0.37.1 -> v0.38.0)
  • eventually the rc branch is merged to stable
  • then stable is merged back to unstable, bumping the version there

@dapplion
Copy link
Contributor

Fixed the conflicts and merged stable into unstable here 2eeb965

I disabled branch protections temporarily to do the push

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants