chore: deprecate cherry-picking on release #186
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alarso16
approved these changes
Jun 10, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why this should be merged
Our old strategy of only cherry-picking on release branches made the
mainbranch incompatible with dependent repos.How this works
The goal of the old strategy was to avoid cherry-picking on the same branch to which we would later merge the duplicated, upstream commit. This can instead be achieved by tracking the cherry-picked commits and reverting them as part of the geth sync. Since we already do this for our own changes and a single cherry-pick (see #128), there's no need to use the two approaches simultaneously.
This PR deletes the cherry-picking mechanism and removes the release-branch test that enforced its proper usage. It will be followed up by a series of PRs, one per cherry-pick that would have otherwise been placed on release branches.
How this was tested
n/a