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

feat: enable cherry-pick bot #14151

Merged
merged 2 commits into from
Feb 6, 2025
Merged

feat: enable cherry-pick bot #14151

merged 2 commits into from
Feb 6, 2025

Conversation

Joibel
Copy link
Member

@Joibel Joibel commented Feb 5, 2025

Part of #12592

Motivation

Maintaining released versions of argo-workflows is not automated. This will help by allowing the backporting of commits as they are merged rather than by the release manager at the time of release.

Each PR can be CI tested independently then, and only those that pass get merged.

Modifications

Enabled CI on release branch PRs.

Added a new /cherry-pick action, using the same cherry-pick-bot as argo-cd already use. I have already enabled that bot on this project, but it needs a configuration file as provided here.

Verification

This mostly needs testing after merging.

Documentation

Added documentation for how to use /cherry-pick, and for the other comment based command which already existed: /retest

@Joibel Joibel changed the title feat: enable cherry-pick bot and /test comment feat: enable cherry-pick bot Feb 5, 2025
@Joibel Joibel marked this pull request as ready for review February 5, 2025 16:28
Copy link
Member

@terrytangyuan terrytangyuan left a comment

Choose a reason for hiding this comment

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

This is a great addition. Thanks!

@terrytangyuan terrytangyuan merged commit e4f51c2 into argoproj:main Feb 6, 2025
31 checks passed
@Joibel
Copy link
Member Author

Joibel commented Feb 6, 2025

/cherry-pick release-3.6

Copy link

Cherry-pick failed with Merge error e4f51c23af08ce2e0cd449b1e454b2d9103e3980 into temp-cherry-pick-a3193a-release-3.6

@Joibel
Copy link
Member Author

Joibel commented Feb 6, 2025

/cherry-pick release-3.5

Copy link

Cherry-pick failed with Merge error e4f51c23af08ce2e0cd449b1e454b2d9103e3980 into temp-cherry-pick-a3193a-release-3.5

Joibel added a commit to pipekit/argo-workflows that referenced this pull request Feb 6, 2025
Joibel added a commit that referenced this pull request Feb 6, 2025
(cherry picked from commit e4f51c2)
Signed-off-by: Alan Clucas <[email protected]>
@Joibel
Copy link
Member Author

Joibel commented Feb 7, 2025

The /test command runs the CI, but the checks don't know this in the PR, so it doesn't work as hoped. I'll investigate

@Joibel Joibel deleted the backport branch February 7, 2025 15:32
@jswxstw
Copy link
Member

jswxstw commented Feb 8, 2025

@Joibel Why does my normal comments also trigger CI: https://github.com/argoproj/argo-workflows/actions/runs/13213864653?

@Joibel
Copy link
Member Author

Joibel commented Feb 10, 2025

I forgot there were two entrypoints to the CI workflow, and only added an if statement to the first of them.

I'll work out whether to remove /test or fix this sometime this week.

Joibel added a commit that referenced this pull request Feb 10, 2025
Partial revert of #14151

Signed-off-by: Alan Clucas <[email protected]>
@Joibel
Copy link
Member Author

Joibel commented Feb 10, 2025

#14164 is a partial revert to fix these two issues.

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

Successfully merging this pull request may close these issues.

4 participants