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

Add cherry-pick script #2106

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

tenzen-y
Copy link
Member

@tenzen-y tenzen-y commented May 9, 2024

What this PR does / why we need it:
I added a cherry-pick script. This script is stolen from https://github.com/kubernetes/kubernetes/blob/57b406a18afc54c84725488e0ca3d4b4cabd61db/hack/cherry_pick_pull.sh

You can see example PR here: #2107

Which issue(s) this PR fixes (optional, in Fixes #<issue number>, #<issue number>, ... format, will close the issue(s) when PR gets merged):
Fixes #

Checklist:

  • Docs included if any changes are user facing

Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from tenzen-y. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tenzen-y
Copy link
Member Author

tenzen-y commented May 9, 2024

/assign @andreyvelich @johnugeorge

@andreyvelich
Copy link
Member

@tenzen-y Thanks for this.
Should we try to re-use GitHub actions, like in KServe: kserve/kserve#3653 ?

@tenzen-y
Copy link
Member Author

tenzen-y commented May 9, 2024

@tenzen-y Thanks for this. Should we try to re-use GitHub actions, like in KServe: kserve/kserve#3653 ?

Yeah, we could support that command. But we need this script since we sometimes face git conflict.
So, we can work on automating cherry-picking by actions as a separate one. @andreyvelich WDYT?

@coveralls
Copy link

Pull Request Test Coverage Report for Build 9019416582

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 35.415%

Totals Coverage Status
Change from base Build 8997849275: 0.0%
Covered Lines: 4378
Relevant Lines: 12362

💛 - Coveralls

@andreyvelich
Copy link
Member

@tenzen-y Thanks for this. Should we try to re-use GitHub actions, like in KServe: kserve/kserve#3653 ?

Yeah, we could support that command. But we need this script since we sometimes face git conflict. So, we can work on automating cherry-picking by actions as a separate one. @andreyvelich WDYT?

Doesn't this action allow us to resolve conflicts ?

Also, the Kubernetes script using patch for cherry-picks. Would be easier to just do

git cherry-pick <COMMIT_SHA>

@tenzen-y
Copy link
Member Author

tenzen-y commented May 9, 2024

Doesn't this action allow us to resolve conflicts ?

I don't think so. In general, Git conflict has never been automatically resolved.

Also, the Kubernetes script using patch for cherry-picks. Would be easier to just do

This script is useful because creating cherry-pick PR as well.
Actually, #2107 is automatically created by this script.

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

Successfully merging this pull request may close these issues.

None yet

4 participants