feat(publish): Ability to merge to non-default #245
Merged
Conversation
This file contains 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
tonyo
approved these changes
May 26, 2021
jan-auer
reviewed
May 27, 2021
| @@ -72,6 +72,17 @@ export const builder: CommandBuilder = (yargs: Argv) => { | |||
| 'Source revision (git SHA or tag) to publish (if not release branch head)', | |||
| type: 'string', | |||
| }) | |||
| .option('merge-target', { | |||
There was a problem hiding this comment.
I've often seen "base branch" used as terminology for this, but "merge target" is equally clear.
BYK
added a commit
that referenced
this pull request
Jun 1, 2021
Fix up to #245, see getsentry/publish#353 for more details.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This fixes #239 and fixes #115. This fix requires us to switch
from a purely GitHub API driven publish flow to a purely local
Git driven publish flow as it is not possible to compute the
nearest merge base via any GitHub API. We rely on
git logandsome parsing to be able to determine this.
The patch also effectively reverts #220 as there is now no need
for that (we are operating on the repo directly).
Test run: https://github.com/getsentry/release-tester/commits/releases/0.4.x
Also see no merges to main: https://github.com/getsentry/release-tester/commits/main
Depends on getsentry/publish#334
TODO: re-read config once we switch branches.