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

chore(package.xml): bump version to 0.38.0 #9266

Merged
merged 4 commits into from
Nov 11, 2024

Conversation

youtalk
Copy link
Member

@youtalk youtalk commented Nov 8, 2024

Description

This PR is based on https://github.com/orgs/autowarefoundation/discussions/5292 and aims to manage the versioning of autowarefoundation/autoware.universe using ROS package release tools.
All package versions have been unified to 0.38.0 following https://github.com/tier4/autoware.universe/tree/v0.38.0.

Note that this PR is a merge request not for the main branch, but for the newly created humble branch. Once this PR is merged, I plan to tag 0.38.0 on the humble branch and create a PR to merge the differences into the main branch as well.

Currently, I was manually running the ROS package release tools to create PR, but in the future, we would like to modify https://github.com/tier4/autoware-release-scripts to automate this process.

Related links

https://github.com/orgs/autowarefoundation/discussions/5292

How was this PR tested?

Notes for reviewers

None.

Interface changes

None.

Effects on system behavior

None.

@youtalk
Copy link
Member Author

youtalk commented Nov 8, 2024

@mitsudome-r @xmfcx A branch protection rule is needed for the humble branch. Please set it up with conditions similar to those of the main branch, but it should allow merge commits rather than squash merges.

@xmfcx
Copy link
Contributor

xmfcx commented Nov 8, 2024

@youtalk -san, I can add the branch protection rules.

but it should allow merge commits rather than squash merges.

Why? We could have the releases and version control without needing merge commits.

I've checked the practices utilized by many official ROS 2 packages and none of them allowed merge commits.
They were versioning and backporting by keeping a linear history just fine.

I'd much prefer not to complicate the commit history by allowing merge commits. And keep a linear history for main and ros-distro branches.

Examples

https://github.com/ros2/rosbag2
image

https://github.com/ros2/ros2cli
image

https://github.com/ros2/rclcpp
image

cc. @mitsudome-r

@xmfcx
Copy link
Contributor

xmfcx commented Nov 8, 2024

By the way, I've added the same rulesets as main for humble.

image

@xmfcx xmfcx added the tag:run-build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) label Nov 8, 2024
Copy link

codecov bot commented Nov 8, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 28.76%. Comparing base (0280e0b) to head (fcfd723).
Report is 1 commits behind head on humble.

Additional details and impacted files
@@           Coverage Diff           @@
##           humble    #9266   +/-   ##
=======================================
  Coverage   28.76%   28.76%           
=======================================
  Files        1314     1314           
  Lines      101743   101743           
  Branches    39592    39592           
=======================================
  Hits        29263    29263           
  Misses      69474    69474           
  Partials     3006     3006           
Flag Coverage Δ *Carryforward flag
differential 28.75% <ø> (?)
total 28.76% <ø> (ø) Carriedforward from 0280e0b

*This pull request uses carry forward flags. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@youtalk
Copy link
Member Author

youtalk commented Nov 11, 2024

@xmfcx If we merge all patch PRs that exist only in the humble branch into the main branch with individual PRs, squash merging will still be fine going forward.
Please review this! cc @mitsudome-r

Copy link
Member

@mitsudome-r mitsudome-r left a comment

Choose a reason for hiding this comment

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

I have confirmed that the changes are only made to package.xml and CHANGELOG.rst.

For the package.xml, the PR is only updating version to 0.38.

I haven't looked into all the details of each CHANGELOG.rst, but I don't think there is a necessity to review them in details since they are generated automatically. We can always update them if we notice a package with wrong changelogs.

Copy link
Contributor

@soblin soblin left a comment

Choose a reason for hiding this comment

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

OK for my pkgs

Copy link
Contributor

@rej55 rej55 left a comment

Choose a reason for hiding this comment

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

LGTM

@youtalk youtalk merged commit 73bbc16 into autowarefoundation:humble Nov 11, 2024
42 checks passed
@youtalk youtalk deleted the release-0.38.0 branch November 11, 2024 04:51
youtalk added a commit to youtalk/autoware.universe that referenced this pull request Nov 11, 2024
* unify package.xml version to 0.37.0

Signed-off-by: Yutaka Kondo <[email protected]>

* remove system_monitor/CHANGELOG.rst

Signed-off-by: Yutaka Kondo <[email protected]>

* add changelog

Signed-off-by: Yutaka Kondo <[email protected]>

* 0.38.0

---------

Signed-off-by: Yutaka Kondo <[email protected]>
youtalk added a commit that referenced this pull request Nov 11, 2024
* unify package.xml version to 0.37.0



* remove system_monitor/CHANGELOG.rst



* add changelog



* 0.38.0

---------

Signed-off-by: Yutaka Kondo <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component:common Common packages from the autoware-common repository. (auto-assigned) component:control Vehicle control algorithms and mechanisms. (auto-assigned) component:evaluator Evaluation tools for planning, localization etc. (auto-assigned) component:launch Launch files, scripts and initialization tools. (auto-assigned) component:localization Vehicle's position determination in its environment. (auto-assigned) component:map Map creation, storage, and loading. (auto-assigned) component:perception Advanced sensor data processing and environment understanding. (auto-assigned) component:planning Route planning, decision-making, and navigation. (auto-assigned) component:sensing Data acquisition from sensors, drivers, preprocessing. (auto-assigned) component:simulation Virtual environment setups and simulations. (auto-assigned) component:system System design and integration. (auto-assigned) component:tools Utility and debugging software. (auto-assigned) component:vehicle Vehicle-specific implementations, drivers, packages. (auto-assigned) tag:require-cuda-build-and-test tag:run-build-and-test-differential Mark to enable build-and-test-differential workflow. (used-by-ci) type:documentation Creating or refining documentation. (auto-assigned)
Projects
Development

Successfully merging this pull request may close these issues.

5 participants