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.

Sign up for GitHub

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

Jump to bottom

[MIG][16.0] server_environment_delivery #626

Merged
merged 7 commits into from
Jan 31, 2024
Merged

[MIG][16.0] server_environment_delivery #626

merged 7 commits into from
Jan 31, 2024

Conversation

mmequignon
Copy link
Member

No description provided.

@mmequignon mmequignon force-pushed the server_environment_delivery-16.0 branch from 337af82 to 976f7b4 Compare March 30, 2023 13:54
@ajaniszewska-dev
Copy link
Contributor

we miss "migration to 16.0" commit - imo we should rename "pre-commit stuff" commit into that.

simahawk
simahawk reviewed Apr 5, 2023
View reviewed changes
Copy link
Contributor

@simahawk simahawk left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LG
@mmequignon pls update commits

@mmequignon mmequignon force-pushed the server_environment_delivery-16.0 branch from 976f7b4 to 21a5d53 Compare April 12, 2023 11:43
simahawk
simahawk approved these changes Apr 12, 2023
View reviewed changes
server_environment_delivery/models/delivery_carrier.py
_name = "delivery.carrier"
_inherit = ["delivery.carrier", "server.env.techname.mixin", "server.env.mixin"]

tech_name = fields.Char(required=False)
Copy link
Contributor

Choose a reason for hiding this comment

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

you can drop this as the field is not required anymore
https://github.com/OCA/server-env/blob/16.0/server_environment/models/server_env_tech_name_mixin.py

@rousseldenis rousseldenis added this to the 16.0 milestone Apr 13, 2023
@rousseldenis
Copy link
Contributor

@mmequignon Thanks for this. For the next time could you separate pre-commit changes from migration ones in separate commit to avoid these changes in migration commit:
image

@mmequignon
Copy link
Member Author

@mmequignon Thanks for this. For the next time could you separate pre-commit changes from migration ones in separate commit to avoid these changes in migration commit: image

hello @rousseldenis
Yeah well, I can split it.
I actually addressed this comment #626 (comment)
😊

@github-actions
Copy link

There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days.
If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.

@github-actions github-actions bot added the stale PR/Issue without recent activity, it'll be soon closed automatically. label Aug 13, 2023
@simahawk
Copy link
Contributor

@mmequignon Thanks for this. For the next time could you separate pre-commit changes from migration ones in separate commit to avoid these changes in migration commit: image

I don't consider this as a pre-commit change. This is just pre-commit doing something for you when you migrate.
Nowadays we should always have that folder generated on migration otherwise other PRs depending on this might be broken 😉

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 16.0-ocabot-merge-pr-626-by-simahawk-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Aug 23, 2023
@OCA-git-bot
Merge PR #626 into 16.0
504432d 
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 16.0-ocabot-merge-pr-626-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

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@simahawk The rebase process failed, because command git push --force camptocamp tmp-pr-626:server_environment_delivery-16.0 failed with output:

remote: Permission to camptocamp/delivery-carrier.git denied to OCA-git-bot.
fatal: unable to access 'https://github.com/camptocamp/delivery-carrier/': The requested URL returned error: 403

@simahawk
Copy link
Contributor

@mmequignon can you rebase and check the build pls?

@github-actions github-actions bot removed the stale PR/Issue without recent activity, it'll be soon closed automatically. label Aug 27, 2023
florian-dacosta
florian-dacosta approved these changes Oct 3, 2023
View reviewed changes
Copy link
Contributor

@florian-dacosta florian-dacosta left a comment

Choose a reason for hiding this comment

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

@mmequignon kind reminder, if you could do a rebase so we can merge this, it would be nice !

@mmequignon mmequignon force-pushed the server_environment_delivery-16.0 branch from 21a5d53 to 009fac1 Compare October 3, 2023 11:24
@mmequignon
Copy link
Member Author

@mmequignon kind reminder, if you could do a rebase so we can merge this, it would be nice !

Thanks for the reminder, it is done 🙏

@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). 🤖

@florian-dacosta
Copy link
Contributor

@simahawk can you retry to merge please ?

@bguillot
Copy link
Contributor

/ocabot merge nobump

@bguillot
Copy link
Contributor

thank you !

@OCA-git-bot
Copy link
Contributor

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 16.0-ocabot-merge-pr-626-by-bguillot-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit 8439526 into OCA:16.0 Jan 31, 2024
4 checks passed
@OCA-git-bot
Copy link
Contributor

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

@florian-dacosta florian-dacosta florian-dacosta approved these changes

@simahawk simahawk simahawk approved these changes

Assignees
No one assigned
Labels
approved merged 🎉 migration needs review ready to merge
Projects
None yet
Milestone
16.0
Development

Successfully merging this pull request may close these issues.
9 participants
@mmequignon @ajaniszewska-dev @rousseldenis @simahawk @OCA-git-bot @florian-dacosta @bguillot @grindtildeath @oca-travis