Cherry-picks stabilization -> development #773
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e stabilization/2409 release Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Michał Pełka <[email protected]> Signed-off-by: Jan Hanca <[email protected]>
) Signed-off-by: Michał Pełka <[email protected]> Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Jan Hanca <[email protected]>
* Update levels in RoboticManipulationTemplate * Update Ros2ProjectTemplate for ROS2 Jazzy * Update Ros2FleetRobotTemplate for ROS2 Jazzy * Update Dockerfile in Ros2ProjectTemplate Signed-off-by: Jan Hanca <[email protected]>
* Update custom namespace handling that was triggering overrides for each ROS2FrameComponent in a prefab Signed-off-by: Artur Kamieniecki <[email protected]> Signed-off-by: Jan Hanca <[email protected]> Co-authored-by: Jan Hanca <[email protected]> Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Artur Kamieniecki <[email protected]> Co-authored-by: Artur Kamieniecki <[email protected]> Signed-off-by: Jan Hanca <[email protected]>
* Update repo.json for updates for release 2409 * Fix ROS2FleetRobotTemplate errors for wrong ROS distro examples * Update ROS2FleetRobotTemplate version * Update last_updated date * Fix ros2 gem version * Fix ros2 package hash Signed-off-by: Steve Pham <[email protected]> Signed-off-by: Jan Hanca <[email protected]>
* Fix hash for ROS2 Project template * Version bump for the ROS2 Project Template * Fix hashes and versioning for OpenXRTest and Multiplayer template * Regenerated Multiplayer template for repo.json Signed-off-by: Steve Pham <[email protected]> Signed-off-by: Jan Hanca <[email protected]>
Signed-off-by: Jan Hanca <[email protected]>
jhanca-robotecai
force-pushed
the
jh/cherries_stab_dev
branch
from
e307910
to
5fda901
Compare
|
@jhanca-robotecai The ROS2 Gem version should be bumped after this cherry-pick so that it will represent the current development version, since 3.2.1 has been released as an official package. sig-release will need to decide how we handle versioning of o3de-extras since its possible to use either github or the release packages from Project Manager. I would expect that with a x.y.z format of the version, 'z' represents a patch, 'y' a minor version update, and 'z' a major version update. In this case, it would make sense to bump the minor version update in development. |
spham-amzn
approved these changes
Oct 11, 2024
byrcolin
approved these changes
Oct 11, 2024
michalpelka
approved these changes
Oct 14, 2024
pijaro
approved these changes
Oct 15, 2024
byrcolin
added
the
needs-sig
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR do?
This PR cherry-picks the changes that were pushed to the
stabilization/2409branch as fixes but not to thedevelopmentbranch.List of the PRs pushed to the
stabilization/2409branch after the split from thedevelopmentbranch that were added to this PR:List of the PRs pushed to the
stabilization/2409branch after the split from thedevelopmentbranch that were NOT added to this PR:developmentas Cherry-pick: fix bug in a spawner component (#725) #746developmentas Multiplayer Template Fix #735developmenttostabilization/2409@spham-amzn Could you please confirm which version should be set for ROS 2 Gem?
How was this PR tested?
Only 4 PRs were pushed to the
developmentbranch after the split and not cherry-picked to thestabilization/2409branch.These were cherry-picked back from
developmentto a test branch on top of thestabilization/2409branch, available https://github.com/RobotecAI/o3de-extras/tree/jh/cherries_dev_stabThe differences from merge conflicts were solved manually making the two branches perfectly equivalent. There is an empty result for the command: