Skip to content
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

[17.0] server-ux: copier repo update #798

Merged
merged 2 commits into from
Jan 10, 2024
Merged

Conversation

bosd
Copy link
Contributor

@bosd bosd commented Jan 9, 2024

This should update the maintainer tools.
Attempt to fix the xml warning.
cc: @celm1990

@bosd bosd changed the title server-ux: copier repo update [17.0] server-ux: copier repo update Jan 9, 2024
@pedrobaeza
Copy link
Member

Just ignore the XML warning. It's not fixed "upstream" on the copier template (in fact, it should be fixed in README generator).

@bosd
Copy link
Contributor Author

bosd commented Jan 10, 2024

I know, it's not a biggy.
But people, (including myself at first) where confused seeing the warning when reviewing an pr.
Thinking something is wrong in the PR.

The new release of the maintainer-tools, includes an update of the oca generator)
OCA/maintainer-tools#596

Only it is not rolled out at all the V17 branches of the repo.
As the version of maintainer tool is pinned in pre-commit config of the repo.
OCA/oca-addons-repo-template#239

Actually, Is this a task for the @OCA-git-bot to update all the oca repo's when there is a new release of the oca-addons-repo-template?

@pedrobaeza pedrobaeza added this to the 17.0 milestone Jan 10, 2024
Copy link
Member

@pedrobaeza pedrobaeza left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I didn't know about the update in maintainer-tools.

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 17.0-ocabot-merge-pr-798-by-pedrobaeza-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Jan 10, 2024
Signed-off-by pedrobaeza
@OCA-git-bot
Copy link
Contributor

@pedrobaeza your merge command was aborted due to failed check(s), which you can inspect on this commit of 17.0-ocabot-merge-pr-798-by-pedrobaeza-bump-nobump.

After fixing the problem, you can re-issue a merge command. Please refrain from merging manually as it will most probably make the target branch red.

@pedrobaeza
Copy link
Member

Ouch!

base_tier_validation/models/tier_definition.py:77:89: E501 Line too long (90 > 88)

Please rebase and fix the long line after merging base_tier_validation.

@bosd bosd force-pushed the 17.0-repo-update branch from f8553a7 to 99610d2 Compare January 10, 2024 11:59
@bosd bosd force-pushed the 17.0-repo-update branch from 99610d2 to fca74bf Compare January 10, 2024 12:02
@bosd
Copy link
Contributor Author

bosd commented Jan 10, 2024

Done!

base_tier_validation/models/tier_definition.py:77:89: E501 Line too long (90 > 88)

Seems like ruff does'nt auto fix these too long lines.

@pedrobaeza
Copy link
Member

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 17.0-ocabot-merge-pr-798-by-pedrobaeza-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 2433e0c into OCA:17.0 Jan 10, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 75d8eea. Thanks a lot for contributing to OCA. ❤️

@bosd bosd deleted the 17.0-repo-update branch January 10, 2024 12:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants