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

Update copier template 1.15.0 #334

Merged
merged 2 commits into from
Jul 27, 2023

Conversation

micheledic
Copy link

Bump the version of oca template to 1.15.0

@pedrobaeza pedrobaeza added this to the 16.0 milestone Jul 27, 2023
@micheledic micheledic changed the title Update copier 1.15.0 Update copier template 1.15.0 Jul 27, 2023
@micheledic
Copy link
Author

@pedrobaeza can you help me ? the pre-commit is in error.

@pedrobaeza
Copy link
Member

It seems there's a corrupted translation file in base_report_to_printer/i18n/es.po:956

https://github.com/OCA/report-print-send/actions/runs/5680001918/job/15393243458?pr=334#step:7:70

Can you please fix it?

@micheledic
Copy link
Author

It seems there's a corrupted translation file in base_report_to_printer/i18n/es.po:956

https://github.com/OCA/report-print-send/actions/runs/5680001918/job/15393243458?pr=334#step:7:70

Can you please fix it?

I have not changed It in my commit. Should i commit the change on that .po file in this PR or should i create a different PR and than rebase this?

@pedrobaeza
Copy link
Member

No, of course it's not your fault. It's just something hidden that has arisen now that the pre-commit is checking more things. Please fix it adding a commit in this PR.

@micheledic
Copy link
Author

No, of course it's not your fault. It's just something hidden that has arisen now that the pre-commit is checking more things. Please fix it adding a commit in this PR.

Done! Tests ok... When this PR Is merged i can rebase my other PR

@yajo
Copy link
Member

yajo commented Jul 27, 2023

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 16.0-ocabot-merge-pr-334-by-yajo-bump-patch, awaiting test results.

@pedrobaeza
Copy link
Member

Thanks!

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

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

OCA-git-bot added a commit that referenced this pull request Jul 27, 2023
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 16.0-ocabot-merge-pr-334-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.

@pedrobaeza
Copy link
Member

Ouch, overlap! I have cancelled my GH actions for letting the other ones to act.

@OCA-git-bot OCA-git-bot merged commit 9ecc375 into OCA:16.0 Jul 27, 2023
6 checks passed
@OCA-git-bot
Copy link
Contributor

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

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.

4 participants