Release tooling: Fix "picked" labelling#23244
Merged
Merged
Conversation
6 tasks
JReinhold
pushed a commit
that referenced
this pull request
Jul 2, 2023
Release tooling: Fix "picked" labelling (cherry picked from commit 7375f7a)
Merged
15 tasks
8 tasks
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
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.
What I did
Removed the
--first-parentflag when runninggit log.The label patches script works by going through all the commits between
HEADand the latest version release, finding their PRs, and labelling as picked. However currently when runninggit log --first-parent v7.0.23...HEADit only gets the merge commit from the release PR:However when doing the same thing without
--first-parentyou get the correct commits:How to test
The only way to truly test this is to merge it and see if it works the next time.
I tested it locally by checking out
latest-release, and running the script withv7.0.23tag hardocded, which didn't find any changes. Then I removed--first-parent, and it found all the correct PRs to label.Checklist
MIGRATION.MD
Maintainers
make sure to add the
ci:mergedorci:dailyGH label to it.["cleanup", "BREAKING CHANGE", "feature request", "bug", "documentation", "maintenance", "dependencies", "other"]