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][MIG] document_knowledge: Migration to 17.0 #447

Merged
merged 55 commits into from
Feb 9, 2024

Conversation

m1k3lm
Copy link
Member

@m1k3lm m1k3lm commented Dec 21, 2023

/ocabot migration document_knowledge

naousse and others added 30 commits December 21, 2023 17:04
* Copyright and various stuff
* Contributors
* External ID not found in the system: base.group_document_user
Currently translated at 93.9% (31 of 33 strings)

Translation: knowledge-11.0/knowledge-11.0-knowledge
Translate-URL: https://translation.odoo-community.org/projects/knowledge-11-0/knowledge-11-0-knowledge/pt_BR/
Updated by Update PO files to match POT (msgmerge) hook in Weblate.
Otherwise the module grants too wide permissions for all users.
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: knowledge-12.0/knowledge-12.0-knowledge
Translate-URL: https://translation.odoo-community.org/projects/knowledge-12-0/knowledge-12-0-knowledge/
Currently translated at 57.7% (15 of 26 strings)

Translation: knowledge-12.0/knowledge-12.0-knowledge
Translate-URL: https://translation.odoo-community.org/projects/knowledge-12-0/knowledge-12-0-knowledge/fr/
@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). 🤖

@pedrobaeza
Copy link
Member

@m1k3lm please split pre-commit commit from the migration itself, and also squash latest administrative commits into the generating one.

image

@m1k3lm m1k3lm force-pushed the 17.0-mig-document_knowledge branch from 04d31be to 959d9bc Compare January 30, 2024 22:23
@m1k3lm
Copy link
Member Author

m1k3lm commented Jan 30, 2024

@pedrobaeza not sure If I got what you meant, let see if it is ok like this.

@pedrobaeza
Copy link
Member

There's still no 2 commits, one for pre-commit stuff, and another for the migration itself. See https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-17.0#technical-method-to-migrate-a-module-from-160-to-170-branch for the original method to follow.

@m1k3lm
Copy link
Member Author

m1k3lm commented Jan 31, 2024

Sorry, @pedrobaeza I still don't understand what you mean. 959d9bc is the migration itself all the previous ones are what you call "pre-commit stuff"? If I sqash all of them into one the commit history would get lost.

@pedrobaeza
Copy link
Member

You didn't follow the migration procedure, splitting the stuff resulting of running pre-commit run -a in a separate commit. Please review the technical procedure carefully.

@m1k3lm m1k3lm force-pushed the 17.0-mig-document_knowledge branch from 959d9bc to 7bb2333 Compare January 31, 2024 22:48
@pedrobaeza
Copy link
Member

Now the commits are mostly correct (the version shouldn't be changed in the pre-commit commit), but you should also switch the configuration view (res.config.settings) according the instructions in https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-17.0#tasks-to-do-in-the-migration

@m1k3lm m1k3lm force-pushed the 17.0-mig-document_knowledge branch from 7bb2333 to 78aa3fe Compare February 2, 2024 18:14
@m1k3lm m1k3lm force-pushed the 17.0-mig-document_knowledge branch from 78aa3fe to 3484421 Compare February 2, 2024 18:18
@m1k3lm
Copy link
Member Author

m1k3lm commented Feb 2, 2024

I did not change anything in the pre-commit, just run pre-commit run -a and commit. Version is changed here
I've made the changes to the view (res.config.settings)

Thanks a lot for your time @pedrobaeza

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.

Thanks for the efforts:

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 17.0-ocabot-merge-pr-447-by-pedrobaeza-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Feb 2, 2024
Signed-off-by pedrobaeza
@jjscarafia
Copy link

@pedrobaeza can you send to merge again? Don´t know why but oca bot didn't merge it

@pedrobaeza
Copy link
Member

System glitches...

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

This PR looks fantastic, let's merge it!
Prepared branch 17.0-ocabot-merge-pr-447-by-pedrobaeza-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit e9ecb88 into OCA:17.0 Feb 9, 2024
7 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at 07d98d3. 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.