backport-main label does not auto backport

@astrofrog

Hello and thanks for this very useful bot. We have a workflow where we forward-port change log from a release branch back to main at release time. Hence, we created a backport-main label (see https://github.com/astropy/astropy/labels) with the auto backport directive. However, the auto backport does not work, though the manual comment does. Example:

Finalizing changelog for v6.1.0 astropy/astropy#16381

cc @astrofrog

Hum, I only have 48 hours of logs, so can't look at it after the fact. Sorry about that, I'll try to experiment on test-repo.

@Carreau

@Carreau it has just happened again today in case you are able to spot it in the logs (for astropy)

He did say the logs only go for 48 hours and your issue is 2 days old, so unlikely.

Hmm yes sorry misremembered, time flies!

Sorry, I was on time-off and did not check github for a few days.

Just a heads-up that I will soon be merging a PR labelled backport-main: astropy/astropy#16911 (in a few hours)

I just merged the PR at 11:58 GMT

Requested a manual backport at 12:52 GMT (this succeeded)

So I think 2 things need addressing for this label to work properly.

backport-main should automatically open a PR to main when it detects merge event from a PR that is not opened against main.
On a PR with backport-main label that is opened against main (currently possible via the bot via comment backport to main), it should not try to backport that backport PR to main again on merge. Currently it does and then post an error message comment, unless I remove backport-main label before merge.

I wonder if the issue here is that the PR for which we want backport-main to work is not merged into main but into a release branch - perhaps the bot only watches for PRs opened again main?

I wonder if the issue here is that the PR for which we want backport-main to work is not merged into main but into a release branch - perhaps the bot only watches for PRs opened again main?

It is quite possible, otherwise as the backported PRs get the same labels applied than the original one, merging a backport would trigger an infinite loop.

There is likely a smarter way to do that, but I did not look into it.

Maybe the logic here (or around here)

MeeseeksDev/meeseeksdev/meeseeksbox/core.py

Lines 354 to 357 in 8e81617

    
           if "on-merge:" in description_str and is_pr["base"]["ref"] in ( 
        
               "master", 
        
               "main", 
        
           ):

can be generalized to something like

Grab the base ref branch no matter what.
Check for target branch in label description.
If base ref same as target, no-op and quit.
Otherwise, attempt backport as usual.

but I don't know the code enough to make a PR and it does not look like I can just do a few lines simple change at that location.

OR

You can also say that we're abusing a backport bot to do forwardport and just close this as won't fix. Though would be nice to have this limitation documented at https://meeseeksbox.github.io/ if this is what you choose to do.

Thanks!

Navigation Menu

Repository navigation

backport-main label does not auto backport #123

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

	if "on-merge:" in description_str and is_pr["base"]["ref"] in (
	"master",
	"main",
	):

backport-main label does not auto backport #123

Description

Activity

Carreau commented on May 7, 2024

astrofrog commented on Jul 25, 2024

pllim commented on Jul 25, 2024

astrofrog commented on Jul 25, 2024

Carreau commented on Jul 29, 2024

astrofrog commented on Aug 30, 2024

astrofrog commented on Aug 30, 2024

astrofrog commented on Aug 30, 2024

pllim commented on Aug 30, 2024

astrofrog commented on Aug 30, 2024

Carreau commented on Sep 2, 2024

pllim commented on Sep 3, 2024

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions