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

Merge main into 0.1 release branch #46

Open
wants to merge 3 commits into
base: release-0.1
Choose a base branch
from

Conversation

luca-della-vedova
Copy link
Member

This PR just brings in the latest changes from main into the release-0.1 branch. Specifically, to unblock downstream migrations on rmf_site we need the DeliveryLabel macro PR #30, which is not released.

Eventually I'd like to bring the change all the way to the release-0.2 branch for Bevy 0.14 migration, I thought the sequence would be a main -> 0.1, followed by a 0.1 -> 0.2` but I might have missed something

Signed-off-by: Luca Della Vedova <[email protected]>
@mxgrey
Copy link
Contributor

mxgrey commented Jan 9, 2025

Looks like we'll need to remove the 1.75 test for this branch or else the CI will always be red.

I anticipate we'll need to keep targeting important features at v0.0.x for them to be hypothetically build farm compatible.

@luca-della-vedova
Copy link
Member Author

luca-della-vedova commented Jan 9, 2025

Agreed! I suspect this PR should not be squash merged but normal merged to preserve history? If that is the case should I amend / force push the merge commit to avoid minor changes (specifically to fix the style) or create a Fix Style commit?
Removing the CI should probably still be a separate commit to keep track of the change

@mxgrey
Copy link
Contributor

mxgrey commented Jan 9, 2025

Yeah, regular commit makes sense. The hard part will be remembering to switch the mode when the time comes.

Signed-off-by: Luca Della Vedova <[email protected]>
Signed-off-by: Luca Della Vedova <[email protected]>
@luca-della-vedova luca-della-vedova marked this pull request as ready for review January 9, 2025 07:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants