Skip to content

feat: Add GitHub Actions cherry-pick slash command - #9172

Merged
tekton-robot merged 1 commit into
tektoncd:mainfrom
vdemeester:cherry-pick-slash-command
Nov 27, 2025
Merged

feat: Add GitHub Actions cherry-pick slash command#9172
tekton-robot merged 1 commit into
tektoncd:mainfrom
vdemeester:cherry-pick-slash-command

Conversation

@vdemeester

@vdemeester vdemeester commented Nov 25, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Changes

This is an experimentation to replace the cherry-pick prow plugin with a GitHub workflow.
I need to try this out with forks on a repository, so I'll put a hold, but I would be happy to have feedbacks.

Also, I will update the DEVELOPMENT.md.

/hold
/kind misc

Next steps

  • Extract this into the plumbing repository
  • Add this configuration to any other repository that need/wants it 👼🏼

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

  • Has Docs if any changes are user facing, including updates to minimum requirements e.g. Kubernetes version bumps
  • Has Tests included if any functionality added or changed
  • pre-commit Passed
  • Follows the commit message standard
  • Meets the Tekton contributor standards (including functionality, content, code)
  • Has a kind label. You can add one by adding a comment on this PR that contains /kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tep
  • Release notes block below has been updated with any user facing changes (API changes, bug fixes, changes requiring upgrade notices or deprecation warnings). See some examples of good release notes.
  • Release notes contains the string "action required" if the change requires additional action from users switching to the new release

Release Notes

NONE

@tekton-robot tekton-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. release-note-none Denotes a PR that doesnt merit a release note. kind/misc Categorizes issue or PR as a miscellaneuous one. labels Nov 25, 2025
@tekton-robot tekton-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 25, 2025
@vdemeester

vdemeester commented Nov 25, 2025

Copy link
Copy Markdown
Member Author

cc @tektoncd/core-maintainers

@vdemeester
vdemeester force-pushed the cherry-pick-slash-command branch from 412e16c to 4645812 Compare November 25, 2025 09:12
@waveywaves

waveywaves commented Nov 25, 2025

Copy link
Copy Markdown
Member

has this been tested on a test repo ?

@vdemeester

vdemeester commented Nov 25, 2025

Copy link
Copy Markdown
Member Author

has this been tested on a test repo ?

I am working on testing this now on a repository, that's why I put a hold on it 👼🏼

@waveywaves

waveywaves commented Nov 25, 2025

Copy link
Copy Markdown
Member

/retest

afrittoli
afrittoli reviewed Nov 25, 2025
View reviewed changes
Comment thread .github/workflows/cherry-pick-command.yaml Outdated
afrittoli
afrittoli reviewed Nov 25, 2025
View reviewed changes

@afrittoli afrittoli left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks, good idea!

@vdemeester

vdemeester commented Nov 25, 2025

Copy link
Copy Markdown
Member Author

For what is worth, iterating in shortbrain/workflows-experiments#1 🙃

@vdemeester
vdemeester force-pushed the cherry-pick-slash-command branch from 4645812 to 77797b0 Compare November 25, 2025 22:31
@vdemeester

vdemeester commented Nov 25, 2025 •
edited
Loading

Copy link
Copy Markdown
Member Author

For what is worth, iterating in shortbrain/workflows-experiments#1 🙃

Alright, the current implementation is working (tested in the pull-request above and in shortbrain/workflows-experiments#3). I am looking into simplifying it (a go binary, …).

@afrittoli the main reason to go with a script or a go binary is.. to easily port it to Tekton task/pipeline later 👼🏼

afrittoli
afrittoli reviewed Nov 26, 2025
View reviewed changes
Comment thread .github/workflows/cherry-pick-command.yaml Outdated
@vdemeester
vdemeester force-pushed the cherry-pick-slash-command branch from 77797b0 to 029423b Compare November 26, 2025 10:09
vdemeester
vdemeester commented Nov 26, 2025
View reviewed changes
Comment thread .github/workflows/cherry-pick-command.yaml
@vdemeester

vdemeester commented Nov 26, 2025

Copy link
Copy Markdown
Member Author

/hold cancel

@tekton-robot tekton-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 26, 2025
@afrittoli

afrittoli commented Nov 26, 2025

Copy link
Copy Markdown
Member

/retest

@vdemeester @claude
feat: Add GitHub Actions cherry-pick slash command
eb11f34 
- Replace Prow cherry-picker with native GitHub Actions workflow
- Enable fork-safe automated cherry-picking via /cherry-pick command
- Use SHA-pinned actions for enhanced security and reproducibility

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
Co-authored-by: Claude <noreply@anthropic.com>
@vdemeester
vdemeester force-pushed the cherry-pick-slash-command branch from 029423b to eb11f34 Compare November 26, 2025 14:11
@vdemeester

vdemeester commented Nov 26, 2025

Copy link
Copy Markdown
Member Author

/retest

afrittoli
afrittoli reviewed Nov 27, 2025
View reviewed changes

@afrittoli afrittoli left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/approve

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 27, 2025
waveywaves
waveywaves approved these changes Nov 27, 2025
View reviewed changes

@waveywaves waveywaves left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 27, 2025
@tekton-robot

tekton-robot commented Nov 27, 2025

Copy link
Copy Markdown
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: afrittoli, waveywaves

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [afrittoli,waveywaves]

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

@tekton-robot
tekton-robot merged commit 8bbf0ed into tektoncd:main Nov 27, 2025
49 of 52 checks passed
twoGiants
twoGiants approved these changes Nov 27, 2025
View reviewed changes

@twoGiants twoGiants left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

/approve
/lgtm

better later than never 😆

@vdemeester
vdemeester deleted the cherry-pick-slash-command branch November 27, 2025 10:01
@vdemeester

vdemeester commented Nov 27, 2025

Copy link
Copy Markdown
Member Author

/cherry-pick foo

@tekton-robot

tekton-robot commented Nov 27, 2025

Copy link
Copy Markdown
Collaborator

❌ Cherry-pick to foo failed!

The automatic cherry-pick to foo failed.

Output:

🤖 Starting cherry-pick process...
Fetching PR #9172 information...
Found merge commit: 8bbf0ed107998e8e75860d8f1e32387d1bb0c3a2
Fetching target branch: foo...
fatal: couldn't find remote ref foo
❌ ERROR: Target branch 'foo' does not exist or cannot be fetched.

Next steps:

  • Check the action logs for complete details
  • If the PR is not merged, merge it first and try again
  • If there are conflicts, you'll need to manually cherry-pick this PR

@vdemeester

vdemeester commented Nov 27, 2025

Copy link
Copy Markdown
Member Author

It works 😬

@waveywaves waveywaves mentioned this pull request Dec 17, 2025
Closed
12 tasks done
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@afrittoli afrittoli afrittoli left review comments
@twoGiants twoGiants twoGiants approved these changes
@waveywaves waveywaves waveywaves approved these changes
@dibyom dibyom Awaiting requested review from dibyom

Assignees

@waveywaves waveywaves

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/misc Categorizes issue or PR as a miscellaneuous one. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesnt merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

No open projects
Tekton Community Roadmap
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@vdemeester @waveywaves @afrittoli @tekton-robot @twoGiants