OCA / oca-github-bot

The GitHub Bot of the Odoo Community Association (OCA)
MIT License
42 stars 60 forks source link

Maintainer are not able to merge / rebase their modules when migrating #226

Closed legalsylvain closed 1 year ago

legalsylvain commented 1 year ago

Describe the bug

Expected behavior

Additional context I suspect that the commit of the folder setup is not ignored by the bot.

CC : @sbidoul

yajo commented 1 year ago

I just hit the same issue here: https://github.com/OCA/account-financial-tools/pull/1536#issuecomment-1363843998

luisg123v commented 1 year ago

I also suspect it has to do with the setup folder. Problem is:

sbidoul commented 1 year ago

I think it's safe enough to ignore the setup/{addon_name}/ directory.

Side note: for the future, I'm preparing something to get rid of the setup directory and replace it with a pyproject.toml file at the root of each addon. Hopefully it will be ready for 17.

legalsylvain commented 1 year ago

I think it's safe enough to ignore the setup/{addon_name}/ directory.

I think the algorithm should be :

If we can do that, it is quite safe IMO.

Don't know how to implement, thought.

luisg123v commented 1 year ago

if github_login is maintainer of my_module, so allow changes in setup/my_module/ by github_login.

I agree on that

luisg123v commented 1 year ago

if github_login is maintainer of my_module, so allow changes in setup/my_module/ by github_login.

I think this is already working like this, I just merged a case like the described one: https://github.com/OCA/crm/pull/502

legalsylvain commented 1 year ago

OK. I'll make a test !

legalsylvain commented 1 year ago

You're right. It works now ! https://github.com/OCA/geospatial/pull/335#issuecomment-1603712563

sbidoul commented 1 year ago

@legalsylvain any idea of what changed in 6 month to make that work? I don't remember having done something for that myself. Have you?

legalsylvain commented 1 year ago

I don't. I suspect a change of configuration in the server. Is it possible ?

sbidoul commented 1 year ago

I doubt it's related to server configuration. I hope we have not introduced a regression.

legalsylvain commented 1 year ago

I doubt it's related to server configuration.

I'm talking about that param :

https://github.com/OCA/oca-github-bot/blob/master/environment.sample#L84

I hope we have not introduced a regression.

the next time you want to merge something on mis-builder (or other where I have no right), you can ping me and I'll try to call ocabot. Shouldn't work.

pedrobaeza commented 1 year ago

Maybe 16.0 should be in that list?

sbidoul commented 1 year ago

Maybe 16.0 should be in that list?

It is, I just checked.

yajo commented 2 months ago

Sorry, but this should be reopened. Check out https://github.com/OCA/product-attribute/pull/1675#issuecomment-2250264806. @Shide maintains the v15 version but can't merge the migration.