Skip to content

Commit

Permalink
feat: enable cherry-pick bot (#14151)
Browse files Browse the repository at this point in the history
(cherry picked from commit e4f51c2)
  • Loading branch information
Joibel committed Feb 6, 2025
1 parent d418c68 commit 5bf74c3
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .github/cherry-pick-bot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
enabled: true
preservePullRequestTitle: true
12 changes: 12 additions & 0 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
pull_request:
branches:
- "main"
- "release-*"
issue_comment:
types: [created]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -19,6 +22,15 @@ permissions:
jobs:
changed-files:
name: Get changed files
if: >
(
github.event_name == 'issue_comment' &&
github.event.issue.pull_request != null &&
github.event.comment.author_association == 'MEMBER' &&
github.event.comment.body == '/test'
) || (
github.event_name != 'issue_comment'
)
outputs:
# reference: https://github.com/tj-actions/changed-files#outputs-
tests: ${{ steps.changed-files.outputs.tests_any_modified == 'true' }}
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
pull_request:
branches:
- main
- release/*
issue_comment:
types: [created]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -18,6 +21,15 @@ permissions:
jobs:
docs:
runs-on: ubuntu-24.04
if: >
(
github.event_name == 'issue_comment' &&
github.event.issue.pull_request != null &&
github.event.comment.author_association == 'MEMBER' &&
github.event.comment.body == '/test'
) || (
github.event_name != 'issue_comment'
)
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
Expand Down
10 changes: 10 additions & 0 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,16 @@ Subsequently, if there is still no response, it will be automatically closed as

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

## Automated actions

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:

* `/retest` - re-run any failing test cases
* `/test` - trigger the full test suite.
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.
* `/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.
This can be used prior to merging and the PR will be created after the merge, or commented after merging for an immediate attempt.

## Sustainability Effort

Argo Workflows is seeking more [Reviewers and Approvers](https://github.com/argoproj/argoproj/blob/main/community/membership.md) to help keep it viable.
Expand Down
10 changes: 1 addition & 9 deletions docs/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,7 @@ this was successful.
## Update Changelog

Once the tag is published, GitHub Actions will automatically open a PR to update the changelog. Once the PR is ready,
you can approve it, enable auto-merge, and then run the following to force trigger the CI build:

```bash
git branch -D create-pull-request/changelog
git fetch upstream
git checkout --track upstream/create-pull-request/changelog
git commit -s --allow-empty -m "chore: Force trigger CI"
git push upstream create-pull-request/changelog
```
you can approve it, enable auto-merge, and comment `/test` to run CI on it.

## Announce on Slack

Expand Down

0 comments on commit 5bf74c3

Please sign in to comment.