Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

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

Open
legalsylvain opened this issue Nov 23, 2022 · 17 comments
Open
Labels
bug Something isn't working

Comments

@legalsylvain
Copy link
Collaborator

Describe the bug

Expected behavior

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

CC : @sbidoul

@legalsylvain legalsylvain added the bug Something isn't working label Nov 23, 2022
@yajo
Copy link
Member

yajo commented Dec 23, 2022

I just hit the same issue here: OCA/account-financial-tools#1536 (comment)

@luisg123v
Copy link

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

  • If changes on that folder are not included in PR, it won't pass CI
  • If that folder is ignored, (AFAIK) someone could introduce any changes there

@sbidoul
Copy link
Member

sbidoul commented Jun 5, 2023

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
Copy link
Collaborator Author

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

I think the algorithm should be :

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

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

Don't know how to implement, thought.

@luisg123v
Copy link

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

I agree on that

@luisg123v
Copy link

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: OCA/crm#502

@legalsylvain
Copy link
Collaborator Author

OK. I'll make a test !

@legalsylvain
Copy link
Collaborator Author

You're right. It works now !
OCA/geospatial#335 (comment)

@sbidoul
Copy link
Member

sbidoul commented Jun 23, 2023

@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
Copy link
Collaborator Author

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

@sbidoul
Copy link
Member

sbidoul commented Jun 23, 2023

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

@legalsylvain
Copy link
Collaborator Author

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
Copy link
Member

Maybe 16.0 should be in that list?

@sbidoul
Copy link
Member

sbidoul commented Jun 23, 2023

Maybe 16.0 should be in that list?

It is, I just checked.

@yajo
Copy link
Member

yajo commented Jul 29, 2024

Sorry, but this should be reopened. Check out OCA/product-attribute#1675 (comment). @Shide maintains the v15 version but can't merge the migration.

@luisg123v
Copy link

A recent case: OCA/hr#1397 (comment)

@sbidoul sbidoul reopened this Oct 31, 2024
@LoisRForgeFlow
Copy link

Probably you don't need more examples, but just in case, one more: OCA/web#3076 (comment)

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
bug Something isn't working
Projects
None yet
Development

No branches or pull requests

6 participants