-
Notifications
You must be signed in to change notification settings - Fork 15
Master depth calculation #38
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
Conversation
e07355d to
1202cec
Compare
1202cec to
a321bab
Compare
| return int(mindepth) | ||
|
|
||
|
|
||
| def main(): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gfcapalbo somewhere along the way the merge depth script seems to be deleting the empty lines in our repos.yaml file, messing with human readability:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gjotten Done. now all top level lines have a space before, with the happy side effect of removing duplicate lines . looks like this:
odoo:
defaults:
depth: 108
remotes:
origin: https://github.com/OCA/OCB.git
gfcapalbo: https://github.com/gfcapalbo/Odoo
target: origin ${ODOO_VERSION}
merges:
- origin ${ODOO_VERSION}
- gfcapalbo 14.0-backport-null-first-query-from-master
- gfcapalbo 14.0-compute_notify_recipients-query-fix
therp/oe_bvtherp:
defaults:
depth: ${WAFT_DEPTH_MERGE}
remotes:
origin: git@gitlab.therp.nl:therp/oe_bvtherp.git
merges:
- origin ${ODOO_VERSION}
- origin 14.0-#9929-portal_from_draft_to_discuss
- origin 14.0-9964-use-web_widget_html_markdown
OCA/account-analytic:
defaults:
depth: ${WAFT_DEPTH_MERGE}
remotes:
origin: https://github.com/OCA/account-analytic
merges:
- origin ${ODOO_VERSION}
OCA/account-financial-reporting:
defaults:
depth: ${WAFT_DEPTH_MERGE}
remotes:
origin: https://github.com/OCA/account-financial-reporting
merges:
- origin ${ODOO_VERSION}
OCA/account-financial-tools:
defaults:
depth: 971
remotes:
origin: https://github.com/OCA/account-financial-tools
ddejong: https://github.com/ddejong-therp/account-financial-tools
gfcapalbo: https://github.com/gfcapalbo/account-financial-tools
merges:
- origin ${ODOO_VERSION}
- ddejong ${ODOO_VERSION}-account_move_default_journal
- gfcapalbo ${ODOO_VERSION}-error_management_chart_update
OCA/account-fiscal-rule:
defaults:
depth: ${WAFT_DEPTH_MERGE}
Also do not break on brand new remotes.
…eakable [IMP] #9787 Update depth for new branches
2556b69 to
1066c75
Compare
|
@gjotten @Hussam-Suleiman requested changes done |
|
for now, I will merge the changes to master, and in same time I am working to upgrade it to the new version https://github.com/sunflowerit/waftlib/blob/v.23.08.03/.python-files/waft-update-depths . |
|
@gfcapalbo it does not work for odoo 8 with python 2.7, did you test it with all odoo versions? |
|
after I merged this changes and then removed it from master again, I can't open this pull request again, @gfcapalbo do you have any idea? |
|
@gfcapalbo @gjotten @NL66278 sorry for destroyed this pull request, we will continue on #40 |
| args = parser.parse_args() | ||
|
|
||
|
|
||
| all_commits = {} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see that this is never set?
|
@Hussam-Suleiman replaced with MR: #41 I have added an exit , if python version is not >= 3.5. it was easier to manage it this way instead of writing a lot of different code to support python 2.7 wich is deprecated. |
|
@Hussam-Suleiman re-tested. now script will exit when python is < 3.5 and the depth calculation will not be supported for older projects.... the error you had will not appear anymore. |


Before building we run an update_depth script.
This is made to keep depths in waft updated.
If build is on it's first run the check will not happen.
Deployed and testing on our internal nightly instance.