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

[12.0] update dotfiles #458

Merged
merged 5 commits into from
Dec 14, 2022
Merged

[12.0] update dotfiles #458

merged 5 commits into from
Dec 14, 2022

Conversation

hbrunn
Copy link
Member

@hbrunn hbrunn commented Nov 23, 2022

No description provided.

@hbrunn hbrunn mentioned this pull request Nov 23, 2022
with crm_secondary_salesperson (which has none so it's considered beta)
@pedrobaeza pedrobaeza added this to the 12.0 milestone Dec 14, 2022
@pedrobaeza
Copy link
Member

/ocabot merge patch

@hbrunn
Copy link
Member Author

hbrunn commented Dec 14, 2022

he ocabot?

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Dec 14, 2022
Signed-off-by hbrunn
@OCA-git-bot
Copy link
Contributor

@hbrunn your merge command was aborted due to failed check(s), which you can inspect on this commit of 12.0-ocabot-merge-pr-458-by-hbrunn-bump-patch.

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

Error: Version 3.6 with arch x64 not found

It seems this Python version has gone out during last days.

@hbrunn
Copy link
Member Author

hbrunn commented Dec 14, 2022

hmmm. So we'll have to discuss OCA-wide how to handle this. I run several 12.0 instances with python 3.10 and OCA/OCB#1037, will propose doing this on the mailinglist

@hbrunn
Copy link
Member Author

hbrunn commented Dec 14, 2022

@hbrunn
Copy link
Member Author

hbrunn commented Dec 14, 2022

if this works, I'll PR that change to the repo template so that the others can just do a copier update

@pedrobaeza
Copy link
Member

This is similar to this conversation: OCA/oca-addons-repo-template#174

@hbrunn
Copy link
Member Author

hbrunn commented Dec 14, 2022

ah, Stephane already predicted that. good, PR follows suit

@pedrobaeza
Copy link
Member

The pre-commit job doesn't start...

I'm launching anyway the merge command to not wait:

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 12.0-ocabot-merge-pr-458-by-pedrobaeza-bump-patch, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Dec 14, 2022
Signed-off-by pedrobaeza
@hbrunn
Copy link
Member Author

hbrunn commented Dec 14, 2022

thanks, I've just opened OCA/oca-addons-repo-template#181

@hbrunn
Copy link
Member Author

hbrunn commented Dec 14, 2022

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 12.0-ocabot-merge-pr-458-by-hbrunn-bump-patch, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit a02768a into OCA:12.0 Dec 14, 2022
@OCA-git-bot
Copy link
Contributor

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

@rousseldenis
Copy link

@hbrunn Remember that !fixup commits won't be squashed with ocabot merge

@hbrunn
Copy link
Member Author

hbrunn commented Dec 14, 2022

thanks, indeed I should have squashed first. Making ocabot squash is on my list though, so sooner or later that will happen :-)

@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 12.0-ocabot-merge-pr-458-by-pedrobaeza-bump-patch.

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.

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.

5 participants