Skip to content

Commit 3d8924a

Browse files
committed
add pre-commit to ensure consistency between repos and submodules
1 parent ca40127 commit 3d8924a

9 files changed

Lines changed: 188 additions & 13 deletions

File tree

.gitmodules

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,45 @@
77
[submodule "src/autoware/core/autoware_adapi_msgs"]
88
path = src/autoware/core/autoware_adapi_msgs
99
url = https://github.com/autowarefoundation/autoware_adapi_msgs.git
10-
# nightly
10+
branch = main
1111
[submodule "src/autoware/core/autoware_internal_msgs"]
1212
path = src/autoware/core/autoware_internal_msgs
1313
url = https://github.com/autowarefoundation/autoware_internal_msgs.git
14-
# nightly
14+
branch = main
1515
[submodule "src/autoware/core/autoware_cmake"]
1616
path = src/autoware/core/autoware_cmake
1717
url = https://github.com/autowarefoundation/autoware_cmake.git
1818
update = none
1919
[submodule "src/autoware/core/autoware_utils"]
2020
path = src/autoware/core/autoware_utils
2121
url = https://github.com/autowarefoundation/autoware_utils.git
22+
branch = main
2223
[submodule "src/autoware/core/autoware_lanelet2_extension"]
2324
path = src/autoware/core/autoware_lanelet2_extension
2425
url = https://github.com/autowarefoundation/autoware_lanelet2_extension.git
2526
update = none
2627
[submodule "src/autoware/core/autoware_core"]
2728
path = src/autoware/core/autoware_core
2829
url = https://github.com/autowarefoundation/autoware_core.git
29-
# nightly
30+
branch = main
3031
[submodule "src/autoware/core/autoware_rviz_plugins"]
3132
path = src/autoware/core/autoware_rviz_plugins
3233
url = https://github.com/autowarefoundation/autoware_rviz_plugins.git
33-
# nightly
34+
branch = main
3435
## universe
3536
[submodule "src/autoware/universe/autoware_universe"]
3637
path = src/autoware/universe/autoware_universe
3738
url = https://github.com/autowarefoundation/autoware_universe.git
38-
# nightly
39+
branch = main
3940
[submodule "src/autoware/universe/external/tier4_ad_api_adaptor"]
4041
# TODO(TIER IV): Migrate to AD API and remove this repository entry.
4142
path = src/autoware/universe/external/tier4_ad_api_adaptor
4243
url = https://github.com/tier4/tier4_ad_api_adaptor.git
43-
# nightly
44+
branch = tier4/universe
4445
[submodule "src/autoware/universe/external/tier4_autoware_msgs"]
4546
path = src/autoware/universe/external/tier4_autoware_msgs
4647
url = https://github.com/tier4/tier4_autoware_msgs.git
47-
# nightly
48+
branch = tier4/universe
4849
[submodule "src/autoware/universe/external/morai_msgs"]
4950
# Fix the version not to merge https://github.com/MORAI-Autonomous/MORAI-ROS2_morai_msgs/pull/9
5051
path = src/autoware/universe/external/morai_msgs
@@ -94,12 +95,12 @@
9495
[submodule "src/autoware/universe/external/managed_transform_buffer"]
9596
path = src/autoware/universe/external/managed_transform_buffer
9697
url = https://github.com/autowarefoundation/managed_transform_buffer.git
97-
# nightly
98+
branch = main
9899
## launcher
99100
[submodule "src/autoware/launcher/autoware_launch"]
100101
path = src/autoware/launcher/autoware_launch
101102
url = https://github.com/autowarefoundation/autoware_launch.git
102-
# nightly
103+
branch = main
103104
## sensor_component
104105
[submodule "src/autoware/sensor_component/external/sensor_component_description"]
105106
path = src/autoware/sensor_component/external/sensor_component_description
@@ -146,7 +147,7 @@
146147
[submodule "src/tools/tools"]
147148
path = src/tools/tools
148149
url = https://github.com/autowarefoundation/autoware_tools.git
149-
# nightly
150+
branch = main
150151
[submodule "src/tools/plotjuggler_ros"]
151152
# This should be removed after merged PR (https://github.com/PlotJuggler/plotjuggler-ros-plugins/pull/94)
152153
path = src/tools/plotjuggler_ros

.pre-commit-config.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,14 @@ repos:
5656
- id: ros-include-guard
5757
- id: sort-package-xml
5858

59+
- repo: https://github.com/paulsohn/pre-commit-hooks-submodules
60+
rev: v0.0.0-pre
61+
hooks:
62+
- id: check-gitmodules
63+
- id: check-submodules-branch
64+
- id: sync-repos-files
65+
args: [--repos-dir, repositories]
66+
5967
- repo: https://github.com/shellcheck-py/shellcheck-py
6068
rev: v0.11.0.1
6169
hooks:

repositories/autoware.repos

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
repositories:
2+
# core
3+
core/autoware_msgs:
4+
type: git
5+
url: https://github.com/autowarefoundation/autoware_msgs.git
6+
version: 588f00df3acca009ea709a74acd6538897eef424
7+
core/autoware_adapi_msgs:
8+
type: git
9+
url: https://github.com/autowarefoundation/autoware_adapi_msgs.git
10+
version: 6c3faf2311db65dbd37a78904c9b96edad4b3bbd
11+
branch: main
12+
core/autoware_internal_msgs:
13+
type: git
14+
url: https://github.com/autowarefoundation/autoware_internal_msgs.git
15+
version: f5524e501775463f508cdb93fe6aec45e1fb4836
16+
branch: main
17+
core/autoware_cmake:
18+
type: git
19+
url: https://github.com/autowarefoundation/autoware_cmake.git
20+
version: 0e0794e034fe1b8fea6e3a0bbcb9d9b8cdba03ad
21+
core/autoware_utils:
22+
type: git
23+
url: https://github.com/autowarefoundation/autoware_utils.git
24+
version: 10d45b89b9902382c56306cf2677b7db9c0846aa
25+
branch: main
26+
core/autoware_lanelet2_extension:
27+
type: git
28+
url: https://github.com/autowarefoundation/autoware_lanelet2_extension.git
29+
version: 5fadbb76b96083685cb36335c3c28d6554392d7e
30+
core/autoware_core:
31+
type: git
32+
url: https://github.com/autowarefoundation/autoware_core.git
33+
version: 853fa38ee7e7384a40534d814f5acf258be10aa4
34+
branch: main
35+
core/autoware_rviz_plugins:
36+
type: git
37+
url: https://github.com/autowarefoundation/autoware_rviz_plugins.git
38+
version: bac3843c2f203feb28ff0963701b763207163ff6
39+
# universe
40+
branch: main
41+
universe/autoware_universe:
42+
type: git
43+
url: https://github.com/autowarefoundation/autoware_universe.git
44+
version: e4fcbe15ca2b564493f226643afb7f738f6886bc
45+
branch: main
46+
universe/external/tier4_ad_api_adaptor: # TODO(TIER IV): Migrate to AD API and remove this repository entry.
47+
type: git
48+
url: https://github.com/tier4/tier4_ad_api_adaptor.git
49+
version: e3585b221df80387617e321509aa00953d0e496f
50+
branch: tier4/universe
51+
universe/external/tier4_autoware_msgs:
52+
type: git
53+
url: https://github.com/tier4/tier4_autoware_msgs.git
54+
version: b9c385197baf1a2e77f088bea46e7287cd3ec367
55+
# Fix the version not to merge https://github.com/MORAI-Autonomous/MORAI-ROS2_morai_msgs/pull/9
56+
branch: tier4/universe
57+
universe/external/morai_msgs:
58+
type: git
59+
url: https://github.com/MORAI-Autonomous/MORAI-ROS2_morai_msgs.git
60+
version: e2e75fc1603a9798773e467a679edf68b448e705
61+
universe/external/muSSP:
62+
type: git
63+
url: https://github.com/tier4/muSSP.git
64+
version: c79e98fd5e658f4f90c06d93472faa977bc873b9
65+
universe/external/pointcloud_to_laserscan:
66+
type: git
67+
url: https://github.com/tier4/pointcloud_to_laserscan.git
68+
version: d969ec699f84fad827fbadfa3001c9c657482fbe
69+
universe/external/eagleye:
70+
type: git
71+
url: https://github.com/MapIV/eagleye.git
72+
version: c1919448336e86a8dd9c94a337032c05fcf6c381
73+
universe/external/rtklib_ros_bridge:
74+
type: git
75+
url: https://github.com/MapIV/rtklib_ros_bridge.git
76+
version: ef094407bba4f475a8032972e0c60cbb939b51b8
77+
universe/external/llh_converter:
78+
type: git
79+
url: https://github.com/MapIV/llh_converter.git
80+
version: 07ad112b4f6b83eccd3a5f777bbe40ff01c67382
81+
universe/external/glog: # TODO(Horibe): to use isGoogleInitialized() API in v0.6.0. Remove when the rosdep glog version is updated to v0.6.0 (already updated in Ubuntu 24.04)
82+
type: git
83+
url: https://github.com/tier4/glog.git
84+
version: ea36766fdc2ac8e8c8e3ac988ae69acd6d09bb30
85+
universe/external/bevdet_vendor: # TODO: wrap the original bevdet-tensorrt-cpp source code as a vendor package and provide it to autoware_tensorrt_bevdet package
86+
type: git
87+
url: https://github.com/autowarefoundation/bevdet_vendor.git
88+
version: 0cda477b09ed27cfc8484c792b4f5f3063cf425f
89+
branch: bevdet_vendor-ros2
90+
universe/external/trt_batched_nms:
91+
type: git
92+
url: https://github.com/autowarefoundation/trt_batched_nms.git
93+
version: 1a9df130b4a5d96c25019b5793abbfde42d237ac
94+
universe/external/cuda_blackboard:
95+
type: git
96+
url: https://github.com/autowarefoundation/cuda_blackboard.git
97+
version: 1837689df2891f6223f07c178c21aed252566ede
98+
universe/external/negotiated:
99+
type: git
100+
url: https://github.com/osrf/negotiated.git
101+
version: eac198b55dcd052af5988f0f174902913c5f20e7
102+
universe/external/managed_transform_buffer:
103+
type: git
104+
url: https://github.com/autowarefoundation/managed_transform_buffer.git
105+
version: e235f65986890e7133f33176bc6be5c42b7f3dc7
106+
# launcher
107+
branch: main
108+
launcher/autoware_launch:
109+
type: git
110+
url: https://github.com/autowarefoundation/autoware_launch.git
111+
version: 1f64c91b5ce7ec71a23963e47a3b7a72eee1357e
112+
# sensor_component
113+
branch: main
114+
sensor_component/external/sensor_component_description:
115+
type: git
116+
url: https://github.com/tier4/sensor_component_description.git
117+
version: 03ba094851ec90febfcfc0adb20b64b0e19df7a8
118+
sensor_component/external/nebula:
119+
type: git
120+
url: https://github.com/tier4/nebula.git
121+
version: e4a491fe19694f3b72ec531c3e9997185217a61b
122+
# Fork of transport_drivers that enables reduction of copy operations
123+
sensor_component/transport_drivers:
124+
type: git
125+
url: https://github.com/autowarefoundation/transport_drivers
126+
version: 39ebd8afe1bb9760a6cd6272e428468480f6de90
127+
# Continental compatible version of ROS 2 socket CAN
128+
sensor_component/ros2_socketcan:
129+
type: git
130+
url: https://github.com/autowarefoundation/ros2_socketcan
131+
version: e39a814180b03f00a5692b6951a5d4e9f0463486
132+
# middleware
133+
# TODO(TIER IV): During the transition period of Agnocast introduction,
134+
# the Agnocast ROS packages are provided as a source build.
135+
# Once the transition stabilizes, use the packages released from the official ROS repository.
136+
# Issue: https://github.com/autowarefoundation/autoware/issues/5968
137+
middleware/external/agnocast:
138+
type: git
139+
url: https://github.com/tier4/agnocast.git
140+
version: 7bc17e97c462e578ddf8cfb15714c6b2be5ecfd9

repositories/extra-packages.repos

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
repositories:
2+
sensor_component/external/tamagawa_imu_driver:
3+
type: git
4+
url: https://github.com/tier4/tamagawa_imu_driver.git
5+
version: fc939e9bfbf171986d2d558400a4a4fee97332c6
6+
branch: ros2
7+
vehicle/external/pacmod_interface:
8+
type: git
9+
url: https://github.com/tier4/pacmod_interface.git
10+
version: 7da80108c801fb090e8f86df02c433f8f286fcb8
11+
branch: main

repositories/simulator.repos

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
repositories:
2+
simulator/scenario_simulator:
3+
type: git
4+
url: https://github.com/tier4/scenario_simulator_v2.git
5+
version: 05bc0dde94436c0694cda925b70f6902dfb328b3

repositories/tools.repos

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
repositories:
2+
tools:
3+
type: git
4+
url: https://github.com/autowarefoundation/autoware_tools.git
5+
version: 84ac67f0d22caeafbabbe62ec124e72d00bc6915
6+
branch: main
7+
plotjuggler_ros:
8+
type: git
9+
url: https://github.com/PlotJuggler/plotjuggler-ros-plugins.git
10+
version: ca401274419d1d3c661c450294b83c0659cd913f

src/autoware/core/autoware_core

Submodule autoware_core updated 362 files
Submodule autoware_launch updated 75 files
Submodule autoware_universe updated 1307 files

0 commit comments

Comments
 (0)