nextcloud / backportbot Goto Github PK

View Code? Open in Web Editor NEW

10.0 10.0 8.0 1.02 MB

A bot designed to streamline the process of backporting pull requests or specific commits to older branches

License: GNU Affero General Public License v3.0

JavaScript 0.47% TypeScript 99.53%

backportbot's People

Contributors

Stargazers

Watchers

Forkers

tobiaskaminsky skjnldsv thst-nordic nickvergessen christophwurst

backportbot's Issues

Use a fallback mergetool to resolve easy conflicts

While manually backporting nextcloud/documentation#11565 I notice that git can't automatically cherry-pick the full changes to stable27. Locally I use kdiff3 as mergetool and running "git mergetool" resolves conflicts without my help. So it would be quite cool if the bot could resolve those as well. We might just want to show a warning that there were conflicts and those were resolved automatically.

rebase

I know it is called backport bot, but a "rebase" command would be great, same like dependany bot has it.

Backport bot can't assign bots (dependabot) on a backported PR

Noticed: nextcloud/spreed#11467
Author of PR: dependabot
Backport status: created succesfully

Issue:

Bot posted a message after creating a backport (If I understand it correclty, when trying to assign dependabot on a new PR):

The backport to `stable28` failed. Please do this backport manually.
...
Error: Failed to create pull request: Failed to request reviews: Reviews may only be requested from collaborators.
One or more of the users or teams you specified is not a collaborator of the nextcloud/spreed repository.

Reviews were requested, but PR is processed without any person assigned.

Proposal:

Maybe we could keep in memory a person who triggered a PR, and assign him as a fallback?

check for members of team

Maybe the bot should not be useable by everybody but only members of a given team

Inform about backport policy

Adjust backport bot message to

add info when backport should be done:
TBD
ask developer if they still think that backport is needed, else cancel/remove it

Backport fails if branch with the same name exists

Pick a commit to backport nextcloud/text#776 (comment)
It was the wrong commit
Close the pull request and forget to delete the branch
Pick the correct commit to backport
💥

Skip CI for conflict PRs

Add [ci skip] to backport commits if we detect conflicts.

https://docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs
https://www.google.com/search?hl=en&q=drone%20ci%20skip%20ci

Wrong milestone matched when backporting to master

nextcloud/documentation#1538

Wrong commit author with utf8 characters

Example: nextcloud/documentation#1871

Bot crashes with `[HttpError]: other side closed`

 /app/node_modules/@octokit/request/dist-node/index.js:156
     throw new import_request_error.RequestError(message, 500, {
           ^
 
 RequestError [HttpError]: other side closed
     at /app/node_modules/@octokit/request/dist-node/index.js:156:11
     at addReaction (/app/src/githubUtils.ts:37:2) {
   status: 500,
   request: {
     method: 'POST',
     url: 'https://api.github.com/repos/nextcloud/server/issues/comments/1953680517/reactions',
     headers: {
       accept: 'application/vnd.github.v3+json',
       'user-agent': 'octokit-rest.js/20.0.2 octokit-core.js/5.0.2 Node.js/20.11.1 (linux; x64)',
       authorization: 'token [REDACTED]',
       'content-type': 'application/json; charset=utf-8'
     },
     body: '{"content":"+1"}',
     request: { hook: [Function: bound bound register] }
   }
 }

Copy over the labels

The labels should be copied over (except for some special ones like the "3. to review") in case of the Nextcloud repos.

Open PR even if backport is failing

have a PR
backport it
backport is failing due to conflicts
backport bot is now only saying "failing"

Instead it should open the PR so that users can fix the backport and merge it.
Otherwise/currently they have to do the backport manually again.

create docker deployment

error out properly if cherry-pick failed

Strict mode aka. confirm "no backport needed"

So if there was no "/backport to …" nor "/backport no" the bot should asks:

Is a backport needed?
if no, you can prevent this message in the future by leaving a `/backport no` comment.

Do not backport when pull request closed without merge

nextcloud/3rdparty#191

New system with --stragegy ours may lead to data loss

With latest version, I sometimes see that a backport is missing parts of the commits.
This is dangerous and a drawback than before (where backport had to be done entirely manually in case of a conflict).
I think it is better to not use --strategy ours, but rather commit the merge conflict, so that we can solve it manually.

Error:

Failed to create pull request: Validation Failed:
{
"resource":"PullRequest",
"code":"custom",
"message":"A pull request already exists for nextcloud-libraries:backport/5282/next."
}

Reference: nextcloud-libraries/nextcloud-vue#5282