Skip to content

Conversation

yankinmax
Copy link
Contributor

No description provided.

@yankinmax
Copy link
Contributor Author

@lmignon Could you pls do the same OCA/connector#420 (comment) for https://github.com/OCA/server-auth as well ?

@simahawk simahawk deleted the branch OCA:15.0 November 25, 2021 09:12
@simahawk simahawk closed this Nov 25, 2021
@lmignon
Copy link
Contributor

lmignon commented Nov 25, 2021

@simahawk Why do you've deleted the 15.0 branch? I need it to redo the initialization... Unfortunately, I've no more time today to redo a proper initialization.

@simahawk
Copy link
Contributor

simahawk commented Nov 25, 2021

@lmignon I take care, don't worry. I checked PRs and I didn't see any TBH :/
The branch is back.

@simahawk simahawk reopened this Nov 25, 2021
@simahawk
Copy link
Contributor

@lmignon the bare init is done already, that works w/ the mt tool. I wanted to generate it again from 14.0 w/ all modules uninstallable but it failed (and to do it you need to delete the branch apparently).

Copy link

@ivantodorovich ivantodorovich left a comment

Choose a reason for hiding this comment

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

LG

Copy link
Contributor

@simahawk simahawk left a comment

Choose a reason for hiding this comment

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

You might want to migrate auth_api_key_sever_env too

@simahawk
Copy link
Contributor

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

@simahawk The merge process could not start, because command `git merge --no-ff -m Merge PR #308 into 15.0

Signed-off-by simahawk tmp-pr-308` failed with output:

fatal: refusing to merge unrelated histories

@simahawk
Copy link
Contributor

@yankinmax seems I screwed history relation when deleting 15.0 (which was the only way to try the MT tool for generating a full branch). Could you rebase your work on current 15.0?

OCA-git-bot and others added 3 commits November 26, 2021 12:03
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: server-auth-14.0/server-auth-14.0-auth_api_key
Translate-URL: https://translation.odoo-community.org/projects/server-auth-14-0/server-auth-14-0-auth_api_key/
@dreispt
Copy link
Member

dreispt commented Nov 27, 2021

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 15.0-ocabot-merge-pr-308-by-dreispt-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Nov 27, 2021
Signed-off-by dreispt
@OCA-git-bot
Copy link
Contributor

@dreispt your merge command was aborted due to failed check(s), which you can inspect on this commit of 15.0-ocabot-merge-pr-308-by-dreispt-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.

@yankinmax yankinmax force-pushed the 15.0-mig-auth_api_key branch from 883452a to 4dcb8c4 Compare November 29, 2021 11:12
@yankinmax
Copy link
Contributor Author

@dreispt @simahawk can you pls try again to merge this PR?

@simahawk
Copy link
Contributor

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 15.0-ocabot-merge-pr-308-by-simahawk-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Nov 29, 2021
Signed-off-by simahawk
@OCA-git-bot
Copy link
Contributor

@simahawk your merge command was aborted due to failed check(s), which you can inspect on this commit of 15.0-ocabot-merge-pr-308-by-simahawk-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.

@simahawk
Copy link
Contributor

simahawk commented Nov 29, 2021

@sbidoul could we disable caching for pre-commit to avoid such errors?

Error: reserveCache failed: Cache already exists. Scope: refs/heads/15.0-ocabot-merge-pr-308-by-simahawk-bump-nobump, Key: pre-commit-2-6e9292ce7484c9db39ab47966f1138e55cc541e71579416d61487d23def85a68-23b05f1a0616e9488a803945aa248b3968925367ec725f4d0f32e9d3a68935ac, Version: 28cdb9f5496f334116f23e86f0063f5d3a9348c2e22425a33171e071aadada7e

https://github.com/OCA/server-auth/runs/4352799172?check_suite_focus=true#step:4:125

They happen quite often.

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@dreispt
Copy link
Member

dreispt commented Nov 29, 2021

/ocabot merge nobump

@sbidoul
Copy link
Member

sbidoul commented Nov 29, 2021

could we disable caching for pre-commit to avoid such errors?

@simahawk according to pre-commit/action#41 this is a race condition that is not fixable.
So I'm not sure we can fix it ourselves except by disabling the cache (which may or may not create perf issues).
Also the pre-commit GitHub action is unmaintained as the author is developing https://pre-commit.ci/
Last time I checked https://pre-commit.ci/ was not usable for us as it tries to autoupdate the pre-commit configs, which we don't want. Also our big pre-commit runs (with pylint-odoo and such) would probably kill the guy's free-for-opensource budget. But we may want to reach out to see if there are options.

@simahawk
Copy link
Contributor

So I'm not sure we can fix it ourselves except by disabling the cache (which may or may not create perf issues).

Shall we give it a try?

Meanwhile I got this merged here #311

SiesslPhillip pushed a commit to grueneerde/OCA-server-auth that referenced this pull request Nov 20, 2024
Syncing from upstream OCA/server-auth (12.0)
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.