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

Release tooling: Keep redundant commits when cherry-picking #23289

Merged
merged 1 commit into from
Jul 4, 2023

Conversation

JReinhold
Copy link
Contributor

@JReinhold JReinhold commented Jul 3, 2023

What I did

Adds the --keep-redundant-commits flag to cherry picking when picking patch PRs.

This ensures that it doesn't bail when trying to pick already picked PRs, such as those that have been manually picked previously, or where the "picked" label was not originally on for some reason.

We want to still cherry-pick and commit these commits so they get into the git history, and thus gets correctly labeled when publishing the version. If we instead chose to skip the commits, the labeler would not label such PRs as "picked".

How to test

Checklist

  • Make sure your changes are tested (stories and/or unit, integration, or end-to-end tests)
  • Make sure to add/update documentation regarding your changes
  • If you are deprecating/removing a feature, make sure to update
    MIGRATION.MD

Maintainers

  • If this PR should be tested against many or all sandboxes,
    make sure to add the ci:merged or ci:daily GH label to it.
  • Make sure this PR contains one of the labels below.

["cleanup", "BREAKING CHANGE", "feature request", "bug", "documentation", "maintenance", "dependencies", "other"]

@JReinhold JReinhold self-assigned this Jul 3, 2023
@JReinhold JReinhold added the build Internal-facing build tooling & test updates label Jul 3, 2023
Copy link
Contributor

@kasperpeulen kasperpeulen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

@JReinhold JReinhold merged commit 7b1597e into next Jul 4, 2023
21 of 25 checks passed
@JReinhold JReinhold deleted the skip-empty-picks branch July 4, 2023 07:02
@github-actions github-actions bot mentioned this pull request Jul 4, 2023
7 tasks
@JReinhold JReinhold added patch:yes Bugfix & documentation PR that need to be picked to main branch patch:done Patch/release PRs already cherry-picked to main/release branch labels Jul 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Internal-facing build tooling & test updates patch:done Patch/release PRs already cherry-picked to main/release branch patch:yes Bugfix & documentation PR that need to be picked to main branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants