Skip to content

Commit 5bf74c3

Browse files
committed
feat: enable cherry-pick bot (#14151)
(cherry picked from commit e4f51c2)
1 parent d418c68 commit 5bf74c3

File tree

5 files changed

+37
-9
lines changed

5 files changed

+37
-9
lines changed

.github/cherry-pick-bot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
enabled: true
2+
preservePullRequestTitle: true

.github/workflows/ci-build.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
pull_request:
99
branches:
1010
- "main"
11+
- "release-*"
12+
issue_comment:
13+
types: [created]
1114

1215
concurrency:
1316
group: ${{ github.workflow }}-${{ github.ref }}
@@ -19,6 +22,15 @@ permissions:
1922
jobs:
2023
changed-files:
2124
name: Get changed files
25+
if: >
26+
(
27+
github.event_name == 'issue_comment' &&
28+
github.event.issue.pull_request != null &&
29+
github.event.comment.author_association == 'MEMBER' &&
30+
github.event.comment.body == '/test'
31+
) || (
32+
github.event_name != 'issue_comment'
33+
)
2234
outputs:
2335
# reference: https://github.com/tj-actions/changed-files#outputs-
2436
tests: ${{ steps.changed-files.outputs.tests_any_modified == 'true' }}

.github/workflows/docs.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
pull_request:
88
branches:
99
- main
10+
- release/*
11+
issue_comment:
12+
types: [created]
1013

1114
concurrency:
1215
group: ${{ github.workflow }}-${{ github.ref }}
@@ -18,6 +21,15 @@ permissions:
1821
jobs:
1922
docs:
2023
runs-on: ubuntu-24.04
24+
if: >
25+
(
26+
github.event_name == 'issue_comment' &&
27+
github.event.issue.pull_request != null &&
28+
github.event.comment.author_association == 'MEMBER' &&
29+
github.event.comment.body == '/test'
30+
) || (
31+
github.event_name != 'issue_comment'
32+
)
2133
steps:
2234
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
2335
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0

docs/CONTRIBUTING.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,16 @@ Subsequently, if there is still no response, it will be automatically closed as
134134

135135
See the [Stale Action configuration](https://github.com/argoproj/argo-workflows/blob/main/.github/workflows/stale.yaml) for more details.
136136

137+
## Automated actions
138+
139+
As a member (see [roles](https://github.com/argoproj/argoproj/blob/main/community/membership.md)) of the argo-project you can use the following comments on PRs to trigger actions:
140+
141+
* `/retest` - re-run any failing test cases
142+
* `/test` - trigger the full test suite.
143+
Only use this for PRs where the test suite has not automatically triggered - this is almost always wasteful and will not make things pass that `/retest` doesn't pass.
144+
* `/cherry-pick <branchname>` - will [attempt to cherry-pick](https://github.com/googleapis/repo-automation-bots/tree/main/packages/cherry-pick-bot) this commit after it has been merged to the target branch.
145+
This can be used prior to merging and the PR will be created after the merge, or commented after merging for an immediate attempt.
146+
137147
## Sustainability Effort
138148

139149
Argo Workflows is seeking more [Reviewers and Approvers](https://github.com/argoproj/argoproj/blob/main/community/membership.md) to help keep it viable.

docs/releasing.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,7 @@ this was successful.
5656
## Update Changelog
5757

5858
Once the tag is published, GitHub Actions will automatically open a PR to update the changelog. Once the PR is ready,
59-
you can approve it, enable auto-merge, and then run the following to force trigger the CI build:
60-
61-
```bash
62-
git branch -D create-pull-request/changelog
63-
git fetch upstream
64-
git checkout --track upstream/create-pull-request/changelog
65-
git commit -s --allow-empty -m "chore: Force trigger CI"
66-
git push upstream create-pull-request/changelog
67-
```
59+
you can approve it, enable auto-merge, and comment `/test` to run CI on it.
6860

6961
## Announce on Slack
7062

0 commit comments

Comments
 (0)