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

Adding a backport workflow #15971

Merged
merged 7 commits into from
May 5, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/backport.yml
Piedone marked this conversation as resolved.
Show resolved Hide resolved
Piedone marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
name: Backport PR to branch

on:
issue_comment:
types: [created]
schedule:
# once a day at 13:00 UTC to cleanup old runs
- cron: '0 13 * * *'
# Once a day at 14:00 UTC to clean up old runs.
- cron: '0 14 * * *'

permissions:
contents: write
Expand All @@ -23,7 +24,3 @@ jobs:
Backport of #%source_pr_number% to %target_branch%

/cc %cc_users%

## Risk

## Regression?
6 changes: 6 additions & 0 deletions src/docs/guides/contributing/reviewing-pull-requests.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@ If the PR is coming from a fork, working with its code locally won't be as trivi
- Be sure to merge PRs that don't need a second opinion. This is especially important for external contributors who can't merge their PRs. Keeping PRs open will make them collect merge conflicts and make the contributor demotivated.
- Be especially patient and encouraging with first-time contributors. This is indicated by such a flag on the PR.
- You can add the [Feedback section](contributing-code.md) to your review comment (i.e. the one that you send your per-line comments with) to remind the author about the practices.

## Backporting Pull Requests to Another Branch

Occasionally, you may find it necessary to cherry-pick a pull request into a release branch after it has been merged into main. To facilitate this process, we've established a dedicated workflow called backport.

To initiate the backporting process, simply leave a comment on the pull request you wish to backport. The comment should contain the following command: `/backport to release/1.8`. This command serves as a trigger for the backporting workflow, seamlessly bringing the desired pull request into the specified branch.
Piedone marked this conversation as resolved.
Show resolved Hide resolved