server-tools icon indicating copy to clipboard operation
server-tools copied to clipboard

[17.0][MIG] auto_backup: Migration to 17.0

Open rpinset opened this issue 1 year ago • 4 comments

rpinset avatar Mar 31 '24 12:03 rpinset

Hi @sebastienbeau, @hparfr, some modules you are maintaining are being modified, check this out!

OCA-git-bot avatar Mar 31 '24 12:03 OCA-git-bot

@rvalyi I followed the wiki though https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-17.0#how-to

these are my only modifications https://github.com/rpinset/server-tools/commit/b5eb35a138a874f142029d6d3879c393644d501a

rpinset avatar Mar 31 '24 12:03 rpinset

Could you solve the pre-commit issues? You can also squash translation commits of the same person & language: image

Sorry @CRogos, but this is my first attempt to push a migration. I don't know how to use pre-commit. I followed the wiki though https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-17.0#how-to these are my only modifications https://github.com/rpinset/server-tools/commit/b5eb35a138a874f142029d6d3879c393644d501a and https://github.com/OCA/server-tools/pull/2894/commits/cafb66fb0cbdee05a1969c790ffa459c9cbfd190

rpinset avatar Apr 15 '24 21:04 rpinset

Yes I also struggled a lot with my first migration. pre-commit is a tool to automate certain things like code formatting. in this case, one issue is the xml formatting. But instead of changing it manually you should install pre-commit on your dev environment. https://github.com/OCA/maintainer-tools/wiki/Install-pre-commit image

To squash certain commits, you find the instructions here: https://github.com/OCA/maintainer-tools/wiki/Merge-commits-in-pull-requests#mergesquash-the-commits-generated-by-bots-or-weblate

in short the most important commands are: git config --global --add rebase.instructionFormat "(%an <%ae>) %s" git rebase -i origin/17.0 # change "pick" by "f" where needed and commit the changes git push -f

CRogos avatar Apr 16 '24 07:04 CRogos

@CRogos I started again and ended up getting all the checks green 😊 can you check this ?

rpinset avatar Jun 27 '24 23:06 rpinset

yes indeed.

But could you still squash some commits. e.g. when there are translations of the same person and same language. image

All migrations commits should be merged and instead of merging 17.0 into this branch you should have rebased this branch. image

Maybe you can rebase it again to remove the merge commit?

CRogos avatar Jun 28 '24 06:06 CRogos

My bad, I forgot. I'm going to try that

rpinset avatar Jun 28 '24 06:06 rpinset

No need to close it... just rebase and update the branch with push force.

CRogos avatar Jun 28 '24 07:06 CRogos

this was an automatic consequence of my git cli :( i try again here https://github.com/OCA/server-tools/pull/2975

rpinset avatar Jun 28 '24 08:06 rpinset