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

Backport action #8191

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Backport action #8191

wants to merge 5 commits into from

Conversation

amercader
Copy link
Member

Fixes #8181
As discussed in the issue, this PR includes the configuration file for an action that:

  • When a PR that has a label like "Backport " is merged, it will trigger a backport action
  • If the PR commits merge cleanly into the target branch, a new PR will be created against it, assigned to the same user as the merged one. The usual checks will be run on the new PR
  • If the commits don't merge cleanly, a comment will be posted on the orginal PR with the manual commands to fix the conflicts, and the PR will be labelled with "Backport failed"
  • Additionally, Tech Team members can trigger a backport on open or already closed PRs adding a comment starting with /backport (and adding the relevant label)

Some more details:

  • The action is run using a token from the @ckanbot account, this needs to be stored in the repository secrets (BACKPORT_ACTION_PAT)
  • There are also two public variables (TECH_TEAM_USER_IDS and CKANBOT_USER_ID) that need to be added to the repository variables.
  • The action used source code code can be found at https://github.com/korthout/backport-action

Fixes #8181

This commit includes the configuration file for an action that:

* When a PR that has a label like "Backport <branch>" is merged,
  it will trigger a backport action
* If the PR commits merge cleanly into the target branch, a new PR will
  be created against it, assigned to the same user as the merged one.
  The usual checks will be run on the new PR
* If the commits don't merge cleanly, a comment will be posted on the
  orginal PR with the manual commands to fix the conflicts, and the PR
  will be labelled with "Backport failed"
* Additionally, Tech Team members can trigger a backport on open or
  already closed PRs adding a comment starting with `/backport` (and
  adding the relevant label)

Some more details:
* The action is run using a token from the @ckanbot account, this needs
  to be stored in the repository secrets (`BACKPORT_ACTION_PAT`)
* There are also two public variables (`TECH_TEAM_USER_IDS` and
  `CKANBOT_USER_ID`) that need to be added to the repository variables.
* The action used source code code can be found at
  https://github.com/korthout/backport-action
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

Automating backports via GitHub Actions
3 participants