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)
Signed-off-by: Alan Clucas <[email protected]>
  • Loading branch information
Joibel committed Feb 6, 2025
1 parent d94c214 commit e9e5ed7
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 10 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
14 changes: 13 additions & 1 deletion .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 @@ -17,7 +20,16 @@ permissions:

jobs:
docs:
runs-on: ubuntu-latest
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
47 changes: 47 additions & 0 deletions docs/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,50 @@ Please check out the following resources if you are interested in contributing:
* [90m hands-on contributor workshop](https://youtu.be/zZv0lNCDG9w).
* [Deep-dive into components and hands-on experiments](https://docs.google.com/presentation/d/1IU0a3unnr3tBRi38Zn3EHQZj3z6yvocfG9x9icRu1LE/edit?usp=sharing).
* [Architecture overview](https://github.com/argoproj/argo-workflows/blob/main/docs/architecture.md).

#### Reviewing PRs

Anybody can review a PR.
If you are in a [designated role](#roles), add yourself as an "Assignee" to a PR if you plan to lead the review.
If you are a Reviewer or below, then once you have approved a PR, request a review from one or more Approvers and above.

#### Triaging Bugs

New bugs need to be triaged to identify the highest priority ones.
Any Member can triage bugs.

Apply the labels `P0`, `P1`, `P2`, and `P3`, where `P0` is highest priority and needs immediate attention, followed by `P1`, `P2`, and then `P3`.
If there's a new `P0` bug, notify the [`#argo-wf-contributors`](https://cloud-native.slack.com/archives/C0510EUH90V) Slack channel.

Any bugs with >= 5 "👍" reactions should be labeled at least `P1`.
Any bugs with 3-4 "👍" reactions should be labeled at least `P2`.
Bugs can be [sorted by "👍"](https://github.com/argoproj/argo-workflows/issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc+label%3Atype%2Fbug).

If the issue is determined to be a user error and not a bug, remove the `type/bug` label (and the `type/regression` label, if applicable) and replace it with the `type/support` label.
If more information is needed from the author to diagnose the issue, then apply the `problem/more information needed` label.

Please only assign issues to members. New contributors are encouraged to work on a PR directly without being assigned.

##### Staleness

Only issues and PRs that have the [`problem/more information needed` label](https://github.com/argoproj/argo-workflows/labels/problem%2Fmore%20information%20needed) will be considered for staleness.

If the author does not respond timely to a request for more information, the issue or PR will be automatically marked with the `problem/stale` label and a bot message.
Subsequently, if there is still no response, it will be automatically closed as "not planned".

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.
Please see [Sustainability Effort](https://github.com/argoproj/argo-workflows/blob/main/community/sustainability_effort.md) for more information.
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 e9e5ed7

Please sign in to comment.