-
-
Notifications
You must be signed in to change notification settings - Fork 460
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
[FIX] do not use MAIN_BRANCHES anymore #601
Conversation
Hi @sbidoul do you mind having a look at this PR that should fix the missing 17.0 branches in Weblate ? Best Regards ! |
Thanks for taking care about this. I worry this change will break things, as it will expose non-main branches such as the merge bot branches. Would it make sense to pass |
810e3eb
to
d6cdb12
Compare
I have added the use of is_main_branch function in branch_filter by default in the function. I do not see that much of a risk, but I do not have your level of knowledge so I trust you on that ! |
Ah yes, I see it now 🤦 And the MAIN_BRANCHES global is already deprecated. So let's remove it completely if we stop maintaining it? While you are at it let's drop 8, 9, 10 here ? |
d6cdb12
to
2841063
Compare
Alright, I just removed MAIN_BRANCHES variable from config.py as well ! |
BTW (not for this PR), we can also drop OCA_PROJECTS, since it is completely out of date. |
I was looking into it, but OCA_PROJECTS is used in check_contrib script. |
I don't know. Never used it myself. You can perhaps simply replace OCA_PROJECT by get_repositories() in that script. |
Fixes
This PR tends to fix the issue that 17.0 branch are not taken into account by oca_projects.py get_repositories_and_branches function causing for instance that these are not created in Weblate (see https://odoo-community.org/groups/contributors-15/contributors-1545495).
The script used for populating weblate is calling that function which does not return v17.0 branch (https://github.com/OCA/oca-weblate-deployment/blob/75ad176738d15ac2d99aaf0311e31036e39e74d9/wocg-oca#L12C21-L12C50)
According to #539 MAIN_BRANCHES was deprecated and should not be used anymore, so I remove it from default parameter.
With this change, 17.0 branches are properly returned.