From 58325c04fd012dabe8da22e32fba8e70f2df5b6b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 30 Oct 2023 14:59:19 +0900 Subject: [PATCH 01/85] add arm support branch Signed-off-by: Masaya Kataoka --- dependency_humble.repos | 4 ++++ .../sensor_simulation/lidar/raycaster.hpp | 2 +- .../sensor_simulation/primitives/primitive.hpp | 2 +- simulation/simple_sensor_simulator/package.xml | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dependency_humble.repos b/dependency_humble.repos index 831241efebb..7d9790429cc 100644 --- a/dependency_humble.repos +++ b/dependency_humble.repos @@ -23,3 +23,7 @@ repositories: type: git url: https://github.com/tier4/tier4_autoware_msgs.git version: tier4/universe # for Autoware.Universe (TIER IV) + embree_vendor: + type: git + url: https://github.com/OUXT-Polaris/embree_vendor.git + version: master diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp index d1113e8f5ac..64f1a1219de 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__RAYCASTER_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__RAYCASTER_HPP_ -#include +#include #include #include diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp index 9f83be58331..c514d40247e 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__PRIMITIVES__PRIMITIVE_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__PRIMITIVES__PRIMITIVE_HPP_ -#include +#include #include #include diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index f1bdba391a2..d74480f0da5 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -39,7 +39,7 @@ autoware_perception_msgs boost eigen - embree + embree_vendor libpcl-all-dev nav_msgs pcl_conversions From cba9aae205947ed2fce3fa32631fc4b39f8994a1 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 30 Oct 2023 15:07:55 +0900 Subject: [PATCH 02/85] change header Signed-off-by: Masaya Kataoka --- .../sensor_simulation/lidar/raycaster.hpp | 2 +- .../sensor_simulation/primitives/primitive.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp index 64f1a1219de..d1113e8f5ac 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__RAYCASTER_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__RAYCASTER_HPP_ -#include +#include #include #include diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp index c514d40247e..9f83be58331 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__PRIMITIVES__PRIMITIVE_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__PRIMITIVES__PRIMITIVE_HPP_ -#include +#include #include #include From 07b57038e13d02e0a731037bd39b0179f5e92101 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 27 Nov 2023 13:01:40 +0900 Subject: [PATCH 03/85] update repos file Signed-off-by: Masaya Kataoka --- dependency_humble.repos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency_humble.repos b/dependency_humble.repos index 7d9790429cc..74b01c39442 100644 --- a/dependency_humble.repos +++ b/dependency_humble.repos @@ -25,5 +25,5 @@ repositories: version: tier4/universe # for Autoware.Universe (TIER IV) embree_vendor: type: git - url: https://github.com/OUXT-Polaris/embree_vendor.git + url: https://github.com/tier4/embree_vendor.git version: master From 2418ae02234a2e9e5f0633d25b43328f9fa4c4c2 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 27 Nov 2023 06:00:38 +0000 Subject: [PATCH 04/85] modify cmake Signed-off-by: Ubuntu --- openscenario/openscenario_visualization/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openscenario/openscenario_visualization/CMakeLists.txt b/openscenario/openscenario_visualization/CMakeLists.txt index 27c70b45498..090206a2712 100644 --- a/openscenario/openscenario_visualization/CMakeLists.txt +++ b/openscenario/openscenario_visualization/CMakeLists.txt @@ -11,8 +11,9 @@ if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 14) endif() +# Dirty Hack! : ignore class-memaccess warning for ARM support, this is temporal solution it should be fixed. if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - add_compile_options(-Wall -Wpedantic -Werror) # -Wextra + # add_compile_options(-Wall -Werror) # -Wextra #-Wpedantic endif() # find dependencies From f76a640961c3fe65812bd9041f58bb309ea893be Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 27 Nov 2023 06:38:47 +0000 Subject: [PATCH 05/85] remove some warnings Signed-off-by: Ubuntu --- simulation/simple_sensor_simulator/CMakeLists.txt | 2 +- .../sensor_simulation/lidar/raycaster.hpp | 2 +- .../sensor_simulation/primitives/primitive.hpp | 2 +- .../sensor_simulation/sensor_simulation.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/simulation/simple_sensor_simulator/CMakeLists.txt b/simulation/simple_sensor_simulator/CMakeLists.txt index 0f86ab40145..80e2ce3cc01 100644 --- a/simulation/simple_sensor_simulator/CMakeLists.txt +++ b/simulation/simple_sensor_simulator/CMakeLists.txt @@ -53,7 +53,7 @@ ament_auto_add_library(simple_sensor_simulator_component SHARED src/vehicle_simulation/vehicle_model/sim_model_interface.cpp ) target_link_libraries(simple_sensor_simulator_component - embree3 + embree4 pthread sodium zmq diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp index d1113e8f5ac..64f1a1219de 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__RAYCASTER_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__RAYCASTER_HPP_ -#include +#include #include #include diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp index 9f83be58331..c514d40247e 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/primitives/primitive.hpp @@ -15,7 +15,7 @@ #ifndef SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__PRIMITIVES__PRIMITIVE_HPP_ #define SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__PRIMITIVES__PRIMITIVE_HPP_ -#include +#include #include #include diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp index 7c9dfb300f9..6927a364d4f 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp @@ -92,7 +92,7 @@ class SensorSimulation } auto attachPseudoTrafficLightsDetector( - const double current_simulation_time, + const double /*current_simulation_time*/, const simulation_api_schema::PseudoTrafficLightDetectorConfiguration & configuration, rclcpp::Node & node, std::shared_ptr hdmap_utils) -> void { From 2db956a7397bc934468df9be58cadc285d0fe835 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 27 Nov 2023 06:42:54 +0000 Subject: [PATCH 06/85] rename to new struct name https://github.com/embree/embree/blob/be0accfd0b246e2b03355b8ee7710a22c1b49240/README.md?plain=1#L1360-L1361 Signed-off-by: Ubuntu --- .../sensor_simulation/lidar/raycaster.hpp | 2 +- .../src/sensor_simulation/lidar/raycaster.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp index 64f1a1219de..13e887a018b 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp @@ -76,7 +76,7 @@ class Raycaster static void intersect( int thread_id, int thread_count, RTCScene scene, - pcl::PointCloud::Ptr thread_cloud, RTCIntersectContext context, + pcl::PointCloud::Ptr thread_cloud, RTCRayQueryContext context, geometry_msgs::msg::Pose origin, std::reference_wrapper> ref_thread_detected_ids, double max_distance, double min_distance, diff --git a/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp b/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp index a8ffc0ed6d6..918985ff3ad 100644 --- a/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp +++ b/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp @@ -119,7 +119,7 @@ const sensor_msgs::msg::PointCloud2 Raycaster::raycast( std::vector::Ptr> thread_cloud(thread_count); rtcCommitScene(scene_); - RTCIntersectContext context; + RTCRayQueryContext context; for (unsigned int i = 0; i < threads.size(); ++i) { thread_cloud[i] = pcl::PointCloud::Ptr(new pcl::PointCloud()); threads[i] = std::thread( From 9a396857239bd659e6cce915817357af3f7991e3 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 27 Nov 2023 06:54:04 +0000 Subject: [PATCH 07/85] remove unused line Signed-off-by: Ubuntu --- .../sensor_simulation/lidar/raycaster.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp index 13e887a018b..9e70f5c1914 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp @@ -74,6 +74,7 @@ class Raycaster std::unordered_map geometry_ids_; std::vector rotation_matrices_; +/* static void intersect( int thread_id, int thread_count, RTCScene scene, pcl::PointCloud::Ptr thread_cloud, RTCRayQueryContext context, @@ -117,6 +118,7 @@ class Raycaster } } }; +*/ } // namespace simple_sensor_simulator #endif // SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__RAYCASTER_HPP_ From 66a66936f89e2d6c0a21a4cf04d19f15bcc26648 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 27 Nov 2023 07:10:55 +0000 Subject: [PATCH 08/85] remove unused function Signed-off-by: Ubuntu --- .../sensor_simulation/lidar/raycaster.hpp | 45 ------------------- 1 file changed, 45 deletions(-) diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp index 9e70f5c1914..95e05fef34d 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp @@ -73,52 +73,7 @@ class Raycaster std::vector detected_objects_; std::unordered_map geometry_ids_; std::vector rotation_matrices_; - -/* - static void intersect( - int thread_id, int thread_count, RTCScene scene, - pcl::PointCloud::Ptr thread_cloud, RTCRayQueryContext context, - geometry_msgs::msg::Pose origin, - std::reference_wrapper> ref_thread_detected_ids, double max_distance, - double min_distance, - std::reference_wrapper> ref_rotation_matrices) - { - auto & rotation_matrices = ref_rotation_matrices.get(); - auto & thread_detected_ids = ref_thread_detected_ids.get(); - const auto orientation_matrix = quaternion_operation::getRotationMatrix(origin.orientation); - for (unsigned int i = thread_id; i < rotation_matrices.size(); i += thread_count) { - RTCRayHit rayhit = {}; - rayhit.ray.org_x = origin.position.x; - rayhit.ray.org_y = origin.position.y; - rayhit.ray.org_z = origin.position.z; - // make raycast interact with all objects - rayhit.ray.mask = 0b11111111'11111111'11111111'11111111; - rayhit.ray.tfar = max_distance; - rayhit.ray.tnear = min_distance; - rayhit.ray.flags = false; - - const auto rotation_mat = orientation_matrix * rotation_matrices.at(i); - rayhit.ray.dir_x = rotation_mat(0); - rayhit.ray.dir_y = rotation_mat(1); - rayhit.ray.dir_z = rotation_mat(2); - rayhit.hit.geomID = RTC_INVALID_GEOMETRY_ID; - rtcIntersect1(scene, &context, &rayhit); - - if (rayhit.hit.geomID != RTC_INVALID_GEOMETRY_ID) { - double distance = rayhit.ray.tfar; - pcl::PointXYZI p; - { - p.x = rotation_matrices.at(i)(0) * distance; - p.y = rotation_matrices.at(i)(1) * distance; - p.z = rotation_matrices.at(i)(2) * distance; - } - thread_cloud->emplace_back(p); - thread_detected_ids.insert(rayhit.hit.geomID); - } - } - } }; -*/ } // namespace simple_sensor_simulator #endif // SIMPLE_SENSOR_SIMULATOR__SENSOR_SIMULATION__LIDAR__RAYCASTER_HPP_ From bfad75737d156c9600244e28f4389337900592a2 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 27 Nov 2023 07:20:40 +0000 Subject: [PATCH 09/85] remove IntersectContext Signed-off-by: Ubuntu --- .../sensor_simulation/lidar/raycaster.hpp | 42 +++++++++++++++++++ .../src/sensor_simulation/lidar/raycaster.cpp | 5 +-- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp index 95e05fef34d..d0bd697c469 100644 --- a/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp +++ b/simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/lidar/raycaster.hpp @@ -73,6 +73,48 @@ class Raycaster std::vector detected_objects_; std::unordered_map geometry_ids_; std::vector rotation_matrices_; + + static void intersect( + int thread_id, int thread_count, RTCScene scene, + pcl::PointCloud::Ptr thread_cloud, geometry_msgs::msg::Pose origin, + std::reference_wrapper> ref_thread_detected_ids, double max_distance, + double min_distance, + std::reference_wrapper> ref_rotation_matrices) + { + auto & rotation_matrices = ref_rotation_matrices.get(); + auto & thread_detected_ids = ref_thread_detected_ids.get(); + const auto orientation_matrix = quaternion_operation::getRotationMatrix(origin.orientation); + for (unsigned int i = thread_id; i < rotation_matrices.size(); i += thread_count) { + RTCRayHit rayhit = {}; + rayhit.ray.org_x = origin.position.x; + rayhit.ray.org_y = origin.position.y; + rayhit.ray.org_z = origin.position.z; + // make raycast interact with all objects + rayhit.ray.mask = 0b11111111'11111111'11111111'11111111; + rayhit.ray.tfar = max_distance; + rayhit.ray.tnear = min_distance; + rayhit.ray.flags = false; + + const auto rotation_mat = orientation_matrix * rotation_matrices.at(i); + rayhit.ray.dir_x = rotation_mat(0); + rayhit.ray.dir_y = rotation_mat(1); + rayhit.ray.dir_z = rotation_mat(2); + rayhit.hit.geomID = RTC_INVALID_GEOMETRY_ID; + rtcIntersect1(scene, &rayhit); + + if (rayhit.hit.geomID != RTC_INVALID_GEOMETRY_ID) { + double distance = rayhit.ray.tfar; + pcl::PointXYZI p; + { + p.x = rotation_matrices.at(i)(0) * distance; + p.y = rotation_matrices.at(i)(1) * distance; + p.z = rotation_matrices.at(i)(2) * distance; + } + thread_cloud->emplace_back(p); + thread_detected_ids.insert(rayhit.hit.geomID); + } + } + } }; } // namespace simple_sensor_simulator diff --git a/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp b/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp index 918985ff3ad..e1325bfa354 100644 --- a/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp +++ b/simulation/simple_sensor_simulator/src/sensor_simulation/lidar/raycaster.cpp @@ -119,12 +119,11 @@ const sensor_msgs::msg::PointCloud2 Raycaster::raycast( std::vector::Ptr> thread_cloud(thread_count); rtcCommitScene(scene_); - RTCRayQueryContext context; for (unsigned int i = 0; i < threads.size(); ++i) { thread_cloud[i] = pcl::PointCloud::Ptr(new pcl::PointCloud()); threads[i] = std::thread( - intersect, i, thread_count, scene_, thread_cloud[i], context, origin, - std::ref(thread_detected_ids[i]), max_distance, min_distance, std::ref(rotation_matrices_)); + intersect, i, thread_count, scene_, thread_cloud[i], origin, std::ref(thread_detected_ids[i]), + max_distance, min_distance, std::ref(rotation_matrices_)); } for (unsigned int i = 0; i < threads.size(); ++i) { threads[i].join(); From da856516b4bf746f86b5c4121326c61b88e6e8f6 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 27 Nov 2023 07:25:44 +0000 Subject: [PATCH 10/85] fix compile error Signed-off-by: Ubuntu --- simulation/simple_sensor_simulator/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/simulation/simple_sensor_simulator/CMakeLists.txt b/simulation/simple_sensor_simulator/CMakeLists.txt index 80e2ce3cc01..0cf80ade497 100644 --- a/simulation/simple_sensor_simulator/CMakeLists.txt +++ b/simulation/simple_sensor_simulator/CMakeLists.txt @@ -53,7 +53,6 @@ ament_auto_add_library(simple_sensor_simulator_component SHARED src/vehicle_simulation/vehicle_model/sim_model_interface.cpp ) target_link_libraries(simple_sensor_simulator_component - embree4 pthread sodium zmq From 4c41ad65e07856ac13270fbe12077724148afb80 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 27 Nov 2023 07:34:27 +0000 Subject: [PATCH 11/85] add scenario Signed-off-by: Ubuntu --- .../scenario/arm_demo.yaml | 245 ++++++++++++++++++ 1 file changed, 245 insertions(+) create mode 100644 test_runner/scenario_test_runner/scenario/arm_demo.yaml diff --git a/test_runner/scenario_test_runner/scenario/arm_demo.yaml b/test_runner/scenario_test_runner/scenario/arm_demo.yaml new file mode 100644 index 00000000000..d2919bcbe00 --- /dev/null +++ b/test_runner/scenario_test_runner/scenario/arm_demo.yaml @@ -0,0 +1,245 @@ +ScenarioModifiers: + ScenarioModifier: [] +OpenSCENARIO: + FileHeader: + revMajor: 1 + revMinor: 1 + date: '2023-11-27T07:31:13.505Z' + description: '' + author: Masaya Kataoka + ParameterDeclarations: + ParameterDeclaration: + - name: __ego_dimensions_length__ + parameterType: double + value: '0' + - name: __ego_dimensions_width__ + parameterType: double + value: '0' + - name: __ego_dimensions_height__ + parameterType: double + value: '0' + - name: __ego_center_x__ + parameterType: double + value: '0' + - name: __ego_center_y__ + parameterType: double + value: '0' + - name: __ego_center_z__ + parameterType: double + value: '0' + CatalogLocations: + CatalogLocation: [] + RoadNetwork: + LogicFile: + filepath: $(find-pkg-share kashiwanoha_map)/map + Entities: + ScenarioObject: + - name: ego + Vehicle: + name: '' + vehicleCategory: car + BoundingBox: + Center: + x: 1.355 + y: 0 + z: 1.25 + Dimensions: + length: 4.77 + width: 1.83 + height: 2.5 + Performance: + maxSpeed: 50 + maxAcceleration: INF + maxDeceleration: INF + Axles: + FrontAxle: + maxSteering: 0.5236 + wheelDiameter: 0.78 + trackWidth: 1.63 + positionX: 1.385 + positionZ: 0.39 + RearAxle: + maxSteering: 0.5236 + wheelDiameter: 0.78 + trackWidth: 1.63 + positionX: 0 + positionZ: 0.39 + Properties: + Property: [] + ObjectController: + Controller: + name: '' + Properties: + Property: + - name: isEgo + value: 'true' + - name: Npc1 + Vehicle: + name: '' + vehicleCategory: car + BoundingBox: + Center: + x: 0 + y: 0 + z: 1.25 + Dimensions: + length: 4 + width: 1.8 + height: 2.5 + Performance: + maxSpeed: 50 + maxAcceleration: INF + maxDeceleration: INF + Axles: + FrontAxle: + maxSteering: 0.5236 + wheelDiameter: 0.6 + trackWidth: 1.8 + positionX: 2 + positionZ: 0.3 + RearAxle: + maxSteering: 0.5236 + wheelDiameter: 0.6 + trackWidth: 1.8 + positionX: 0 + positionZ: 0.3 + Properties: + Property: [] + ObjectController: + Controller: + name: '' + Properties: + Property: [] + Storyboard: + Init: + Actions: + Private: + - entityRef: ego + PrivateAction: + - TeleportAction: + Position: + LanePosition: + roadId: '' + laneId: '34507' + s: 5 + offset: 0 + Orientation: + type: relative + h: 0 + p: -0.0 + r: 0 + - RoutingAction: + AcquirePositionAction: + Position: + LanePosition: + roadId: '' + laneId: '34468' + s: 55 + offset: 0 + Orientation: + type: relative + h: 0 + p: -0.0 + r: 0 + - entityRef: Npc1 + PrivateAction: + - TeleportAction: + Position: + LanePosition: + roadId: '' + laneId: '34507' + s: 25 + offset: 0 + Orientation: + type: relative + h: 0 + p: -0.0 + r: 0 + Story: + - name: '' + Act: + - name: _EndCondition + ManeuverGroup: + - maximumExecutionCount: 1 + name: '' + Actors: + selectTriggeringEntities: false + EntityRef: + - entityRef: ego + Maneuver: + - name: '' + Event: + - name: '' + priority: parallel + StartTrigger: + ConditionGroup: + - Condition: + - name: '' + delay: 0 + conditionEdge: none + ByEntityCondition: + TriggeringEntities: + triggeringEntitiesRule: any + EntityRef: + - entityRef: ego + EntityCondition: + ReachPositionCondition: + Position: + LanePosition: + roadId: '' + laneId: '34468' + s: 55 + offset: 0 + Orientation: + type: relative + h: 0 + p: -0.0 + r: 0 + tolerance: 1 + Action: + - name: '' + UserDefinedAction: + CustomCommandAction: + type: exitSuccess + - name: '' + priority: parallel + StartTrigger: + ConditionGroup: + - Condition: + - name: '' + delay: 0 + conditionEdge: none + ByValueCondition: + SimulationTimeCondition: + value: 180 + rule: greaterThan + - Condition: + - name: '' + delay: 0 + conditionEdge: none + ByEntityCondition: + TriggeringEntities: + triggeringEntitiesRule: any + EntityRef: + - entityRef: ego + EntityCondition: + CollisionCondition: + EntityRef: + entityRef: Npc1 + Action: + - name: '' + UserDefinedAction: + CustomCommandAction: + type: exitFailure + StartTrigger: + ConditionGroup: + - Condition: + - name: '' + delay: 0 + conditionEdge: none + ByValueCondition: + SimulationTimeCondition: + value: 0 + rule: greaterThan + StopTrigger: + ConditionGroup: [] From 5cb4f6faf5986f63703d37533ea14b8e4dee566e Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 4 Dec 2023 12:31:10 +0900 Subject: [PATCH 12/85] comment out build options in cmake Signed-off-by: Masaya Kataoka --- openscenario/openscenario_visualization/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openscenario/openscenario_visualization/CMakeLists.txt b/openscenario/openscenario_visualization/CMakeLists.txt index 090206a2712..846df79b1c9 100644 --- a/openscenario/openscenario_visualization/CMakeLists.txt +++ b/openscenario/openscenario_visualization/CMakeLists.txt @@ -11,9 +11,8 @@ if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 14) endif() -# Dirty Hack! : ignore class-memaccess warning for ARM support, this is temporal solution it should be fixed. if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - # add_compile_options(-Wall -Werror) # -Wextra #-Wpedantic + add_compile_options(-Wall -Werror -Wextra -Wpedantic) endif() # find dependencies From 7dc07b0ae4807aab59097ccf9dd516d1929ac175 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 4 Dec 2023 13:03:15 +0900 Subject: [PATCH 13/85] add docker bake.hcl Signed-off-by: Masaya Kataoka --- Dockerfile | 2 +- docker-bake.hcl | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 docker-bake.hcl diff --git a/Dockerfile b/Dockerfile index 4d69742ada8..822d7631749 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG ROS_DISTRO -FROM ros:${ROS_DISTRO} +FROM ros:${ROS_DISTRO} as build-stage SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NOWARNINGS=yes diff --git a/docker-bake.hcl b/docker-bake.hcl new file mode 100644 index 00000000000..45855db9030 --- /dev/null +++ b/docker-bake.hcl @@ -0,0 +1,18 @@ +group "default" { + targets = ["humble"] +} + +target "base" { + target = "build-stage" + dockerfile = "Dockerfile" + platforms = ["linux/amd64", "linux/arm64/v8"] +} + +target "humble" { + inherits = ["base"] + name = replace("humble-${cuda_version}-${cuda_distro}", ".", "_") + tags = ["ghcr.io/tier4/scenario_simulator_v2:humble"] + args = {"ROS_DISTRO" : "humble"} + group = ["humble"] +} + From d20f52832f062434cf0306260e5ca17566ccf2f3 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 4 Dec 2023 13:04:01 +0900 Subject: [PATCH 14/85] update bkae settings Signed-off-by: Masaya Kataoka --- docker-bake.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 45855db9030..80a45b472d9 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -10,7 +10,7 @@ target "base" { target "humble" { inherits = ["base"] - name = replace("humble-${cuda_version}-${cuda_distro}", ".", "_") + name = "humble" tags = ["ghcr.io/tier4/scenario_simulator_v2:humble"] args = {"ROS_DISTRO" : "humble"} group = ["humble"] From ed93997bbc67c875faea279c1205cba9abe99c49 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 4 Dec 2023 13:06:25 +0900 Subject: [PATCH 15/85] update github actions workflow Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index f476a722b9c..7fad220b5d0 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -42,6 +42,10 @@ jobs: uses: docker/build-push-action@v3 with: tags: ghcr.io/${{ github.repository_owner }}/scenario_simulator_v2:${{ matrix.rosdistro }} + files: | + ./docker-bake.hcl + workdir: . no-cache: true - build-args: ROS_DISTRO=${{ matrix.rosdistro }} push: ${{ github.event_name != 'pull_request' }} + targets: | + ${{ matrix.rosdistro }} \ No newline at end of file From 3ec58ce54c776791a4e110320ed4bf5f2c237d4b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 4 Dec 2023 13:36:34 +0900 Subject: [PATCH 16/85] fix dockerfile Signed-off-by: Masaya Kataoka --- Dockerfile | 1 - docker-bake.hcl | 1 - 2 files changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 822d7631749..acac3817f5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,6 @@ FROM ros:${ROS_DISTRO} as build-stage SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NOWARNINGS=yes -ARG ROS_DISTRO RUN sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common # cspell: ignore kisak diff --git a/docker-bake.hcl b/docker-bake.hcl index 80a45b472d9..b498ab8c6cc 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -15,4 +15,3 @@ target "humble" { args = {"ROS_DISTRO" : "humble"} group = ["humble"] } - From 98ce04b50ea53b135b6f7551b17333bdaafe392e Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 4 Dec 2023 13:40:13 +0900 Subject: [PATCH 17/85] add white line at EoF Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 7fad220b5d0..49601c21f45 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -48,4 +48,4 @@ jobs: no-cache: true push: ${{ github.event_name != 'pull_request' }} targets: | - ${{ matrix.rosdistro }} \ No newline at end of file + ${{ matrix.rosdistro }} From 21a02e5761ba069fa9b7b980cda4ef7d2915d992 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 4 Dec 2023 13:45:34 +0900 Subject: [PATCH 18/85] use docker/bake-action@v3 Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 49601c21f45..07bfc1c10df 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -39,9 +39,8 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v3 + uses: docker/bake-action@v3 with: - tags: ghcr.io/${{ github.repository_owner }}/scenario_simulator_v2:${{ matrix.rosdistro }} files: | ./docker-bake.hcl workdir: . From 9346d08220b18af5ffb51b115d9a466606151313 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 4 Dec 2023 13:49:55 +0900 Subject: [PATCH 19/85] modify bake setting Signed-off-by: Masaya Kataoka --- docker-bake.hcl | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-bake.hcl b/docker-bake.hcl index b498ab8c6cc..e44c8f02961 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -14,4 +14,5 @@ target "humble" { tags = ["ghcr.io/tier4/scenario_simulator_v2:humble"] args = {"ROS_DISTRO" : "humble"} group = ["humble"] + matrix = {} } From b82ca8b254ff63351db6f764a2bbd96ca1a8bfa5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 4 Dec 2023 18:53:29 +0900 Subject: [PATCH 20/85] split workflow Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 07bfc1c10df..e6c7d2397d2 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -18,13 +18,14 @@ on: release: types: [published] jobs: - job1: + build_docker_image: name: Build Docker Image runs-on: ubuntu-20.04 timeout-minutes: 180 strategy: matrix: rosdistro: [humble] + platform: ["linux/amd64", "linux/arm64/v8"] steps: - uses: actions/checkout@v3 @@ -48,3 +49,5 @@ jobs: push: ${{ github.event_name != 'pull_request' }} targets: | ${{ matrix.rosdistro }} + set: | + *.platform=${{ matrix.platform }} From 23373a785afc952be0f14dada2a53d167ea0dc0d Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 5 Dec 2023 14:20:01 +0900 Subject: [PATCH 21/85] extend timeout Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 07bfc1c10df..487d7964d09 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -21,7 +21,7 @@ jobs: job1: name: Build Docker Image runs-on: ubuntu-20.04 - timeout-minutes: 180 + timeout-minutes: 240 strategy: matrix: rosdistro: [humble] From 097b4cb3e0504358c99a7b71d45e41416eb40f5a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 12:29:19 +0900 Subject: [PATCH 22/85] update Dockerfile Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- Dockerfile | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 9d9575c146d..05aaa879cea 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -21,7 +21,7 @@ jobs: build_docker_image: name: Build Docker Image runs-on: ubuntu-20.04 - timeout-minutes: 240 + timeout-minutes: 720 strategy: matrix: rosdistro: [humble] diff --git a/Dockerfile b/Dockerfile index acac3817f5b..af03897a889 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NOWARNINGS=yes -RUN sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common +RUN sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache # cspell: ignore kisak RUN add-apt-repository ppa:kisak/kisak-mesa -y RUN apt-get update && apt-get install libegl-mesa0 -y @@ -20,7 +20,16 @@ WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src RUN source /opt/ros/${ROS_DISTRO}/setup.bash && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws -RUN source /opt/ros/${ROS_DISTRO}/setup.bash && colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release + +ENV CC="/usr/lib/ccache/gcc" +ENV CXX="/usr/lib/ccache/g++" +ENV CCACHE_DIR="/ccache" +RUN --mount=type=cache,target=/ccache source /opt/ros/${ROS_DISTRO}/setup.bash && \ + colcon build --symlink-install \ + --cmake-args \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache COPY ./docker-entrypoint.sh / RUN chmod a+x /docker-entrypoint.sh From adb8c2e7dfcf35516b81180103a61351807899cf Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 15:57:08 +0900 Subject: [PATCH 23/85] fix docker action Signed-off-by: Masaya Kataoka --- .github/workflows/BuildAndRun.yaml | 3 ++- .github/workflows/Docker.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/BuildAndRun.yaml b/.github/workflows/BuildAndRun.yaml index 2f61567a4fa..5ba4aaec2f2 100644 --- a/.github/workflows/BuildAndRun.yaml +++ b/.github/workflows/BuildAndRun.yaml @@ -20,7 +20,7 @@ on: jobs: job1: name: BuildAndRun - runs-on: ubuntu-22.04 + runs-on: ${{ matrix.runs_on }} timeout-minutes: 180 container: ros:${{ matrix.rosdistro }} env: @@ -29,6 +29,7 @@ jobs: fail-fast: false matrix: rosdistro: [humble] + runs_on: [ubuntu-22.04, macos-14] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 steps: - name: suppress warnings run: | diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 05aaa879cea..b2b02972f69 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -25,7 +25,7 @@ jobs: strategy: matrix: rosdistro: [humble] - platform: ["linux/amd64", "linux/arm64/v8"] + platform: ["linux/amd64"] steps: - uses: actions/checkout@v3 From f7b1ba3ca6dd752253bc630d0fa7791006032576 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 16:02:42 +0900 Subject: [PATCH 24/85] comment out steps Signed-off-by: Masaya Kataoka --- .github/workflows/BuildAndRun.yaml | 128 ++++++++++++++--------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/.github/workflows/BuildAndRun.yaml b/.github/workflows/BuildAndRun.yaml index 5ba4aaec2f2..a1522f30f1a 100644 --- a/.github/workflows/BuildAndRun.yaml +++ b/.github/workflows/BuildAndRun.yaml @@ -35,78 +35,78 @@ jobs: run: | git config --global --add safe.directory '*' - - uses: actions/checkout@v2-beta - with: - fetch-depth: 0 - token: ${{ secrets.GITHUB_TOKEN }} + # - uses: actions/checkout@v2-beta + # with: + # fetch-depth: 0 + # token: ${{ secrets.GITHUB_TOKEN }} - - run: git clone https://github.com/RobotecAI/scenario_simulator_v2_scenarios.git + # - run: git clone https://github.com/RobotecAI/scenario_simulator_v2_scenarios.git - - name: Search packages in this repository - id: list_packages - run: | - echo package_list=$(colcon list --names-only | tr '\n' ' ') >> $GITHUB_OUTPUT + # - name: Search packages in this repository + # id: list_packages + # run: | + # echo package_list=$(colcon list --names-only | tr '\n' ' ') >> $GITHUB_OUTPUT - - name: Show target packages - run: | - echo "Target packages: ${{ steps.list_packages.outputs.package_list }}" + # - name: Show target packages + # run: | + # echo "Target packages: ${{ steps.list_packages.outputs.package_list }}" - - name: Copy repository - run: | - mkdir -p ~/ros2_ws/src/scenario_simulator_v2 - cp -rf . ~/ros2_ws/src/scenario_simulator_v2 - shell: bash + # - name: Copy repository + # run: | + # mkdir -p ~/ros2_ws/src/scenario_simulator_v2 + # cp -rf . ~/ros2_ws/src/scenario_simulator_v2 + # shell: bash - - name: Install dependencies - run: | - cd ~/ros2_ws - vcs import src < src/scenario_simulator_v2/dependency_${{ matrix.rosdistro }}.repos + # - name: Install dependencies + # run: | + # cd ~/ros2_ws + # vcs import src < src/scenario_simulator_v2/dependency_${{ matrix.rosdistro }}.repos - - name: Resolve rosdep - run: | - cd ~/ros2_ws - apt update - apt install -y python3-pip - rosdep update --include-eol-distros - rosdep install -iy --from-paths src --rosdistro ${{ matrix.rosdistro }} - shell: bash + # - name: Resolve rosdep + # run: | + # cd ~/ros2_ws + # apt update + # apt install -y python3-pip + # rosdep update --include-eol-distros + # rosdep install -iy --from-paths src --rosdistro ${{ matrix.rosdistro }} + # shell: bash - - name: Build packages - run: | - source /opt/ros/${{ matrix.rosdistro }}/setup.bash - cd ~/ros2_ws - colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_CPP_MOCK_SCENARIOS=ON --packages-up-to ${{ steps.list_packages.outputs.package_list }} - shell: bash + # - name: Build packages + # run: | + # source /opt/ros/${{ matrix.rosdistro }}/setup.bash + # cd ~/ros2_ws + # colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_CPP_MOCK_SCENARIOS=ON --packages-up-to ${{ steps.list_packages.outputs.package_list }} + # shell: bash - - name: Colcon test - run: | - source /opt/ros/${{ matrix.rosdistro }}/setup.bash - cd ~/ros2_ws - source install/local_setup.bash - colcon test --packages-select ${{ steps.list_packages.outputs.package_list }} - shell: bash + # - name: Colcon test + # run: | + # source /opt/ros/${{ matrix.rosdistro }}/setup.bash + # cd ~/ros2_ws + # source install/local_setup.bash + # colcon test --packages-select ${{ steps.list_packages.outputs.package_list }} + # shell: bash - - name: Show test result - if: always() - run: | - source /opt/ros/${{ matrix.rosdistro }}/setup.bash - cd ~/ros2_ws - source install/local_setup.bash - colcon test-result --verbose - shell: bash + # - name: Show test result + # if: always() + # run: | + # source /opt/ros/${{ matrix.rosdistro }}/setup.bash + # cd ~/ros2_ws + # source install/local_setup.bash + # colcon test-result --verbose + # shell: bash - - name: Scenario test - run: | - source ~/ros2_ws/install/setup.bash - source ~/ros2_ws/install/local_setup.bash - ros2 launch scenario_test_runner scenario_test_runner.launch.py workflow:='$(find-pkg-share scenario_test_runner)/config/workflow_example.yaml' global_frame_rate:=20 - ros2 run scenario_test_runner result_checker.py /tmp/scenario_test_runner/result.junit.xml - shell: bash + # - name: Scenario test + # run: | + # source ~/ros2_ws/install/setup.bash + # source ~/ros2_ws/install/local_setup.bash + # ros2 launch scenario_test_runner scenario_test_runner.launch.py workflow:='$(find-pkg-share scenario_test_runner)/config/workflow_example.yaml' global_frame_rate:=20 + # ros2 run scenario_test_runner result_checker.py /tmp/scenario_test_runner/result.junit.xml + # shell: bash - - name: Basic test - run: | - source ~/ros2_ws/install/setup.bash - source ~/ros2_ws/install/local_setup.bash - ros2 launch scenario_test_runner scenario_test_runner.launch.py workflow:='$(find-pkg-share scenario_simulator_v2_scenarios)/workflow/basic.yaml' - ros2 run scenario_test_runner result_checker.py /tmp/scenario_test_runner/result.junit.xml - shell: bash + # - name: Basic test + # run: | + # source ~/ros2_ws/install/setup.bash + # source ~/ros2_ws/install/local_setup.bash + # ros2 launch scenario_test_runner scenario_test_runner.launch.py workflow:='$(find-pkg-share scenario_simulator_v2_scenarios)/workflow/basic.yaml' + # ros2 run scenario_test_runner result_checker.py /tmp/scenario_test_runner/result.junit.xml + # shell: bash From ae9f3d3567f3dd6d255781053f3a568e2676a118 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 16:02:58 +0900 Subject: [PATCH 25/85] uncomment steps Signed-off-by: Masaya Kataoka --- .github/workflows/BuildAndRun.yaml | 128 ++++++++++++++--------------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/.github/workflows/BuildAndRun.yaml b/.github/workflows/BuildAndRun.yaml index a1522f30f1a..5ba4aaec2f2 100644 --- a/.github/workflows/BuildAndRun.yaml +++ b/.github/workflows/BuildAndRun.yaml @@ -35,78 +35,78 @@ jobs: run: | git config --global --add safe.directory '*' - # - uses: actions/checkout@v2-beta - # with: - # fetch-depth: 0 - # token: ${{ secrets.GITHUB_TOKEN }} + - uses: actions/checkout@v2-beta + with: + fetch-depth: 0 + token: ${{ secrets.GITHUB_TOKEN }} - # - run: git clone https://github.com/RobotecAI/scenario_simulator_v2_scenarios.git + - run: git clone https://github.com/RobotecAI/scenario_simulator_v2_scenarios.git - # - name: Search packages in this repository - # id: list_packages - # run: | - # echo package_list=$(colcon list --names-only | tr '\n' ' ') >> $GITHUB_OUTPUT + - name: Search packages in this repository + id: list_packages + run: | + echo package_list=$(colcon list --names-only | tr '\n' ' ') >> $GITHUB_OUTPUT - # - name: Show target packages - # run: | - # echo "Target packages: ${{ steps.list_packages.outputs.package_list }}" + - name: Show target packages + run: | + echo "Target packages: ${{ steps.list_packages.outputs.package_list }}" - # - name: Copy repository - # run: | - # mkdir -p ~/ros2_ws/src/scenario_simulator_v2 - # cp -rf . ~/ros2_ws/src/scenario_simulator_v2 - # shell: bash + - name: Copy repository + run: | + mkdir -p ~/ros2_ws/src/scenario_simulator_v2 + cp -rf . ~/ros2_ws/src/scenario_simulator_v2 + shell: bash - # - name: Install dependencies - # run: | - # cd ~/ros2_ws - # vcs import src < src/scenario_simulator_v2/dependency_${{ matrix.rosdistro }}.repos + - name: Install dependencies + run: | + cd ~/ros2_ws + vcs import src < src/scenario_simulator_v2/dependency_${{ matrix.rosdistro }}.repos - # - name: Resolve rosdep - # run: | - # cd ~/ros2_ws - # apt update - # apt install -y python3-pip - # rosdep update --include-eol-distros - # rosdep install -iy --from-paths src --rosdistro ${{ matrix.rosdistro }} - # shell: bash + - name: Resolve rosdep + run: | + cd ~/ros2_ws + apt update + apt install -y python3-pip + rosdep update --include-eol-distros + rosdep install -iy --from-paths src --rosdistro ${{ matrix.rosdistro }} + shell: bash - # - name: Build packages - # run: | - # source /opt/ros/${{ matrix.rosdistro }}/setup.bash - # cd ~/ros2_ws - # colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_CPP_MOCK_SCENARIOS=ON --packages-up-to ${{ steps.list_packages.outputs.package_list }} - # shell: bash + - name: Build packages + run: | + source /opt/ros/${{ matrix.rosdistro }}/setup.bash + cd ~/ros2_ws + colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_CPP_MOCK_SCENARIOS=ON --packages-up-to ${{ steps.list_packages.outputs.package_list }} + shell: bash - # - name: Colcon test - # run: | - # source /opt/ros/${{ matrix.rosdistro }}/setup.bash - # cd ~/ros2_ws - # source install/local_setup.bash - # colcon test --packages-select ${{ steps.list_packages.outputs.package_list }} - # shell: bash + - name: Colcon test + run: | + source /opt/ros/${{ matrix.rosdistro }}/setup.bash + cd ~/ros2_ws + source install/local_setup.bash + colcon test --packages-select ${{ steps.list_packages.outputs.package_list }} + shell: bash - # - name: Show test result - # if: always() - # run: | - # source /opt/ros/${{ matrix.rosdistro }}/setup.bash - # cd ~/ros2_ws - # source install/local_setup.bash - # colcon test-result --verbose - # shell: bash + - name: Show test result + if: always() + run: | + source /opt/ros/${{ matrix.rosdistro }}/setup.bash + cd ~/ros2_ws + source install/local_setup.bash + colcon test-result --verbose + shell: bash - # - name: Scenario test - # run: | - # source ~/ros2_ws/install/setup.bash - # source ~/ros2_ws/install/local_setup.bash - # ros2 launch scenario_test_runner scenario_test_runner.launch.py workflow:='$(find-pkg-share scenario_test_runner)/config/workflow_example.yaml' global_frame_rate:=20 - # ros2 run scenario_test_runner result_checker.py /tmp/scenario_test_runner/result.junit.xml - # shell: bash + - name: Scenario test + run: | + source ~/ros2_ws/install/setup.bash + source ~/ros2_ws/install/local_setup.bash + ros2 launch scenario_test_runner scenario_test_runner.launch.py workflow:='$(find-pkg-share scenario_test_runner)/config/workflow_example.yaml' global_frame_rate:=20 + ros2 run scenario_test_runner result_checker.py /tmp/scenario_test_runner/result.junit.xml + shell: bash - # - name: Basic test - # run: | - # source ~/ros2_ws/install/setup.bash - # source ~/ros2_ws/install/local_setup.bash - # ros2 launch scenario_test_runner scenario_test_runner.launch.py workflow:='$(find-pkg-share scenario_simulator_v2_scenarios)/workflow/basic.yaml' - # ros2 run scenario_test_runner result_checker.py /tmp/scenario_test_runner/result.junit.xml - # shell: bash + - name: Basic test + run: | + source ~/ros2_ws/install/setup.bash + source ~/ros2_ws/install/local_setup.bash + ros2 launch scenario_test_runner scenario_test_runner.launch.py workflow:='$(find-pkg-share scenario_simulator_v2_scenarios)/workflow/basic.yaml' + ros2 run scenario_test_runner result_checker.py /tmp/scenario_test_runner/result.junit.xml + shell: bash From 0c54463e9cd30c5321270d293cb0a431d71d1a6f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 16:10:39 +0900 Subject: [PATCH 26/85] add test for docker build Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 21 ++++++++++++++++++--- Dockerfile | 3 ++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index b2b02972f69..e626af7101e 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -20,12 +20,12 @@ on: jobs: build_docker_image: name: Build Docker Image - runs-on: ubuntu-20.04 + runs-on: ${{ matrix.runs_on }} timeout-minutes: 720 strategy: matrix: rosdistro: [humble] - platform: ["linux/amd64"] + runs_on: [ubuntu-22.04, macos-14] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 steps: - uses: actions/checkout@v3 @@ -41,6 +41,7 @@ jobs: - name: Build and push uses: docker/bake-action@v3 + if: ${{ matrix.runs_on == 'ubuntu-22.04' }} with: files: | ./docker-bake.hcl @@ -50,4 +51,18 @@ jobs: targets: | ${{ matrix.rosdistro }} set: | - *.platform=${{ matrix.platform }} + *.platform=linux/amd64 + + - name: Build and push + uses: docker/bake-action@v3 + if: ${{ matrix.runs_on == 'macos-14'}} + with: + files: | + ./docker-bake.hcl + workdir: . + no-cache: true + push: ${{ github.event_name != 'pull_request' }} + targets: | + ${{ matrix.rosdistro }} + set: | + *.platform=linux/arm64/v8 diff --git a/Dockerfile b/Dockerfile index af03897a889..0570c1df950 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,8 @@ RUN --mount=type=cache,target=/ccache source /opt/ros/${ROS_DISTRO}/setup.bash & --cmake-args \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -DBUILD_CPP_MOCK_SCENARIOS=ON COPY ./docker-entrypoint.sh / RUN chmod a+x /docker-entrypoint.sh From 6728f0620ba77215f050eef8ee8d3ee1817d995f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 16:14:52 +0900 Subject: [PATCH 27/85] add setup docker action Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index e626af7101e..19687072083 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -27,11 +27,14 @@ jobs: rosdistro: [humble] runs_on: [ubuntu-22.04, macos-14] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 steps: - - uses: actions/checkout@v3 + - name: Setup docker + uses: docker-practice/actions-setup-docker@v1 - - name: Setup Docker Buildx + - name: Setup docker buildx uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v3 + - name: Login to GitHub Container Registry uses: docker/login-action@v2 with: From c53d39634d257e0b4c4e1509026e23e98d802f8a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 16:18:28 +0900 Subject: [PATCH 28/85] install docker to the mac OS Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 19687072083..e62844080e2 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -27,8 +27,9 @@ jobs: rosdistro: [humble] runs_on: [ubuntu-22.04, macos-14] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 steps: - - name: Setup docker - uses: docker-practice/actions-setup-docker@v1 + - name: Install docker for mac runner + if: ${{ matrix.runs_on == 'macos-14'}} + run: brew install --cask docker - name: Setup docker buildx uses: docker/setup-buildx-action@v2 From 9513479a5b78ee7f452877c4eaa1930eb1d0cb62 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 16:26:53 +0900 Subject: [PATCH 29/85] add daemon start command Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index e62844080e2..1a4e927b488 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -29,7 +29,7 @@ jobs: steps: - name: Install docker for mac runner if: ${{ matrix.runs_on == 'macos-14'}} - run: brew install --cask docker + run: brew install docker --cask && docker daemon - name: Setup docker buildx uses: docker/setup-buildx-action@v2 From 2f446cfb2911378ae5ca9a89b0a826b39f433149 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 16:29:29 +0900 Subject: [PATCH 30/85] add dockerd command Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 1a4e927b488..75d5ae8071d 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -29,7 +29,7 @@ jobs: steps: - name: Install docker for mac runner if: ${{ matrix.runs_on == 'macos-14'}} - run: brew install docker --cask && docker daemon + run: brew install docker --cask && dockerd - name: Setup docker buildx uses: docker/setup-buildx-action@v2 From 55790ec63fc2acc019c47dd01564df4f190dc6b4 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 16:39:51 +0900 Subject: [PATCH 31/85] remove --cask Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 75d5ae8071d..0e8def66098 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -29,7 +29,7 @@ jobs: steps: - name: Install docker for mac runner if: ${{ matrix.runs_on == 'macos-14'}} - run: brew install docker --cask && dockerd + run: brew install docker - name: Setup docker buildx uses: docker/setup-buildx-action@v2 From 3ebaf62da92480bc1dfe990182d748b74261c861 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 16:41:50 +0900 Subject: [PATCH 32/85] add dockerd step Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 0e8def66098..a1f69ab7520 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -29,7 +29,7 @@ jobs: steps: - name: Install docker for mac runner if: ${{ matrix.runs_on == 'macos-14'}} - run: brew install docker + run: brew install docker && dockerd - name: Setup docker buildx uses: docker/setup-buildx-action@v2 From a2246cd2034ae8f9017dd9cc0c2bf6f107e7cc88 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 16:49:58 +0900 Subject: [PATCH 33/85] fix docker install step Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index a1f69ab7520..14e7926f548 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -29,7 +29,7 @@ jobs: steps: - name: Install docker for mac runner if: ${{ matrix.runs_on == 'macos-14'}} - run: brew install docker && dockerd + run: brew install --cask docker && docker ps - name: Setup docker buildx uses: docker/setup-buildx-action@v2 From 581d83d9e88f810b1e3ec1b0ed4dc287eb479a97 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 31 Jan 2024 16:54:58 +0900 Subject: [PATCH 34/85] add colima Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 14e7926f548..3784b0d436a 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -29,7 +29,7 @@ jobs: steps: - name: Install docker for mac runner if: ${{ matrix.runs_on == 'macos-14'}} - run: brew install --cask docker && docker ps + run: brew install colima && colima start && docker ps -a - name: Setup docker buildx uses: docker/setup-buildx-action@v2 From 32f5b8786f565b6edc9a2140160f9f7f075c3010 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 12:31:14 +0900 Subject: [PATCH 35/85] modify docker action Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 3784b0d436a..94cb01711a2 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -32,7 +32,7 @@ jobs: run: brew install colima && colima start && docker ps -a - name: Setup docker buildx - uses: docker/setup-buildx-action@v2 + uses: uses: crazy-max/ghaction-setup-docker@v3 - uses: actions/checkout@v3 From 8506e135261600a3a1a17402c1f0d174cea2fa6e Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 14:06:29 +0900 Subject: [PATCH 36/85] fix yaml Signed-off-by: Masaya Kataoka --- .github/workflows/BuildAndRun.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/BuildAndRun.yaml b/.github/workflows/BuildAndRun.yaml index 8cf70775935..ff6e45ef847 100644 --- a/.github/workflows/BuildAndRun.yaml +++ b/.github/workflows/BuildAndRun.yaml @@ -19,13 +19,8 @@ on: - master jobs: job1: -<<<<<<< HEAD name: BuildAndRun runs-on: ${{ matrix.runs_on }} -======= - name: Build and run - runs-on: ubuntu-22.04 ->>>>>>> upstream/master timeout-minutes: 180 container: ros:${{ matrix.rosdistro }} env: From 0a2f62e6b956c679e0e9556e7bf1330163bae18d Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 14:07:49 +0900 Subject: [PATCH 37/85] fix docker yaml Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 94cb01711a2..f51b094ce5d 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -32,7 +32,7 @@ jobs: run: brew install colima && colima start && docker ps -a - name: Setup docker buildx - uses: uses: crazy-max/ghaction-setup-docker@v3 + uses: crazy-max/ghaction-setup-docker@v3 - uses: actions/checkout@v3 From 75028c66b7d781bccf7f26476c067fa5cd56ea4c Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 14:09:19 +0900 Subject: [PATCH 38/85] remove brew install step Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index f51b094ce5d..063ac472c1d 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -27,11 +27,7 @@ jobs: rosdistro: [humble] runs_on: [ubuntu-22.04, macos-14] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 steps: - - name: Install docker for mac runner - if: ${{ matrix.runs_on == 'macos-14'}} - run: brew install colima && colima start && docker ps -a - - - name: Setup docker buildx + - name: Setup docker uses: crazy-max/ghaction-setup-docker@v3 - uses: actions/checkout@v3 From e425ce023f087dce0cd04c58c84063e8f2427f32 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 14:20:25 +0900 Subject: [PATCH 39/85] install docker binary Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 063ac472c1d..b567ddae3ca 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -27,8 +27,9 @@ jobs: rosdistro: [humble] runs_on: [ubuntu-22.04, macos-14] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 steps: - - name: Setup docker - uses: crazy-max/ghaction-setup-docker@v3 + - name: Install docker for mac runner + if: ${{ matrix.runs_on == 'macos-14'}} + run: brew install wget && wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz && tar docker-25.0.3.tgz && cp docker/docker /user/local/bin/ - uses: actions/checkout@v3 From dde022e12779ae72da0f3e747a8b45a7dbe02eb0 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 14:24:08 +0900 Subject: [PATCH 40/85] change decompress option Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index b567ddae3ca..f8e65f40092 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -29,7 +29,7 @@ jobs: steps: - name: Install docker for mac runner if: ${{ matrix.runs_on == 'macos-14'}} - run: brew install wget && wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz && tar docker-25.0.3.tgz && cp docker/docker /user/local/bin/ + run: brew install wget && wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz && tar -xvzf docker-25.0.3.tgz && cp docker/docker /user/local/bin/ - uses: actions/checkout@v3 From 927d8bb440138f74cde7afd38f14a14cf3c92694 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 14:29:46 +0900 Subject: [PATCH 41/85] add tmate step Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index f8e65f40092..272e8b71328 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -27,6 +27,7 @@ jobs: rosdistro: [humble] runs_on: [ubuntu-22.04, macos-14] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 steps: + - uses: mxschmitt/action-tmate@v3 - name: Install docker for mac runner if: ${{ matrix.runs_on == 'macos-14'}} run: brew install wget && wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz && tar -xvzf docker-25.0.3.tgz && cp docker/docker /user/local/bin/ From cc4bf0a415bd513cf9229c1ea6780cfcb9d90149 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 14:32:02 +0900 Subject: [PATCH 42/85] change directory Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 272e8b71328..fef6c732d49 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -27,10 +27,9 @@ jobs: rosdistro: [humble] runs_on: [ubuntu-22.04, macos-14] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 steps: - - uses: mxschmitt/action-tmate@v3 - name: Install docker for mac runner if: ${{ matrix.runs_on == 'macos-14'}} - run: brew install wget && wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz && tar -xvzf docker-25.0.3.tgz && cp docker/docker /user/local/bin/ + run: brew install wget && wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz && tar -xvzf docker-25.0.3.tgz && cp docker/docker /usr/local/bin/ - uses: actions/checkout@v3 From 40a830efc5bcee1fe2912244b26ecc6e1f54c7ba Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 14:46:32 +0900 Subject: [PATCH 43/85] add plugin Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index fef6c732d49..3d08c0b3415 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -29,7 +29,12 @@ jobs: steps: - name: Install docker for mac runner if: ${{ matrix.runs_on == 'macos-14'}} - run: brew install wget && wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz && tar -xvzf docker-25.0.3.tgz && cp docker/docker /usr/local/bin/ + run: | + brew install wget + wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz + tar -xvzf docker-25.0.3.tgz + cp docker/docker /usr/local/bin/ + wget https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-arm64 -O $HOME/.docker/cli-plugins/docker-buildx - uses: actions/checkout@v3 @@ -40,7 +45,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push + - name: Build and push (amd64) uses: docker/bake-action@v3 if: ${{ matrix.runs_on == 'ubuntu-22.04' }} with: @@ -54,7 +59,7 @@ jobs: set: | *.platform=linux/amd64 - - name: Build and push + - name: Build and push (arm64) uses: docker/bake-action@v3 if: ${{ matrix.runs_on == 'macos-14'}} with: From a08b212ee7526bfce55cf9765c54d9c8c7bfd8ef Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 14:48:42 +0900 Subject: [PATCH 44/85] add directory Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 3d08c0b3415..61a691d0ee8 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -34,6 +34,7 @@ jobs: wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz tar -xvzf docker-25.0.3.tgz cp docker/docker /usr/local/bin/ + mkdir -p $HOME/.docker/cli-plugins wget https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-arm64 -O $HOME/.docker/cli-plugins/docker-buildx - uses: actions/checkout@v3 From 165698266e79c3d6e048bb1900fd548b8dc57790 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 15:14:14 +0900 Subject: [PATCH 45/85] update docker build command Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 32 +++++--------------------------- Dockerfile | 2 +- 2 files changed, 6 insertions(+), 28 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 61a691d0ee8..bd123138adb 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -34,8 +34,6 @@ jobs: wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz tar -xvzf docker-25.0.3.tgz cp docker/docker /usr/local/bin/ - mkdir -p $HOME/.docker/cli-plugins - wget https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-arm64 -O $HOME/.docker/cli-plugins/docker-buildx - uses: actions/checkout@v3 @@ -46,30 +44,10 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push (amd64) - uses: docker/bake-action@v3 - if: ${{ matrix.runs_on == 'ubuntu-22.04' }} - with: - files: | - ./docker-bake.hcl - workdir: . - no-cache: true - push: ${{ github.event_name != 'pull_request' }} - targets: | - ${{ matrix.rosdistro }} - set: | - *.platform=linux/amd64 + - name: Build (amd64) + if: ${{ matrix.runs_on == 'ubuntu-22.04'}} + run: docker build -t ghcr.io/tier4/scenario_simulator_v2:${{ matrix.rosdistro }} --platform linux/amd64 . --build-arg ROS_DISTRO=${{ matrix.rosdistro }} - - name: Build and push (arm64) - uses: docker/bake-action@v3 + - name: Build (arm64) if: ${{ matrix.runs_on == 'macos-14'}} - with: - files: | - ./docker-bake.hcl - workdir: . - no-cache: true - push: ${{ github.event_name != 'pull_request' }} - targets: | - ${{ matrix.rosdistro }} - set: | - *.platform=linux/arm64/v8 + run: docker build -t ghcr.io/tier4/scenario_simulator_v2:${{ matrix.rosdistro }} --platform linux/arm64/v8 . --build-arg ROS_DISTRO=${{ matrix.rosdistro }} diff --git a/Dockerfile b/Dockerfile index 0570c1df950..85a8ddc3ee3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG ROS_DISTRO +ARG ROS_DISTRO="humble" FROM ros:${ROS_DISTRO} as build-stage SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive From 6f9cca52bc817225169af19af6be1b53f2d06924 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 15:17:56 +0900 Subject: [PATCH 46/85] modify docker tag Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index bd123138adb..eac5be51b86 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -46,8 +46,8 @@ jobs: - name: Build (amd64) if: ${{ matrix.runs_on == 'ubuntu-22.04'}} - run: docker build -t ghcr.io/tier4/scenario_simulator_v2:${{ matrix.rosdistro }} --platform linux/amd64 . --build-arg ROS_DISTRO=${{ matrix.rosdistro }} + run: docker build -t ghcr.io/tier4/scenario_simulator_v2:${{ matrix.rosdistro }}_amd64 . --build-arg ROS_DISTRO=${{ matrix.rosdistro }} - name: Build (arm64) if: ${{ matrix.runs_on == 'macos-14'}} - run: docker build -t ghcr.io/tier4/scenario_simulator_v2:${{ matrix.rosdistro }} --platform linux/arm64/v8 . --build-arg ROS_DISTRO=${{ matrix.rosdistro }} + run: docker build -t ghcr.io/tier4/scenario_simulator_v2:${{ matrix.rosdistro }}_arm64 . --build-arg ROS_DISTRO=${{ matrix.rosdistro }} From 41c75901fab1a889da223f0034838f71ab30c7ca Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 15:19:15 +0900 Subject: [PATCH 47/85] add systemctl start docker Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index eac5be51b86..86ae2f046a9 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -34,6 +34,7 @@ jobs: wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz tar -xvzf docker-25.0.3.tgz cp docker/docker /usr/local/bin/ + systemctl start docker - uses: actions/checkout@v3 From d3385ce1bcd7f372e607ccdacb7b0e9df822bba5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 15:24:20 +0900 Subject: [PATCH 48/85] add dockerd Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 86ae2f046a9..92e793c5883 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -34,7 +34,7 @@ jobs: wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz tar -xvzf docker-25.0.3.tgz cp docker/docker /usr/local/bin/ - systemctl start docker + dockerd - uses: actions/checkout@v3 From 93653423bc49d9a4c1af6ce7641b11c0d75225b3 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 15:29:20 +0900 Subject: [PATCH 49/85] use buildx Signed-off-by: Masaya Kataoka --- .github/workflows/Docker.yaml | 38 +++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 92e793c5883..f50690fc8e2 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -34,7 +34,13 @@ jobs: wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz tar -xvzf docker-25.0.3.tgz cp docker/docker /usr/local/bin/ - dockerd + mkdir -p $HOME/.docker/cli-plugins + wget https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-arm64 -O $HOME/.docker/cli-plugins/docker-buildx + chmod a+x $HOME/.docker/cli-plugins/docker-buildx + + - name: Install docker for ubuntu runner + if: ${{ matrix.runs_on == 'ubuntu-22.04' }} + uses: docker/setup-buildx-action@v3 - uses: actions/checkout@v3 @@ -45,10 +51,30 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build (amd64) - if: ${{ matrix.runs_on == 'ubuntu-22.04'}} - run: docker build -t ghcr.io/tier4/scenario_simulator_v2:${{ matrix.rosdistro }}_amd64 . --build-arg ROS_DISTRO=${{ matrix.rosdistro }} + - name: Build and push (amd64) + uses: docker/bake-action@v3 + if: ${{ matrix.runs_on == 'ubuntu-22.04' }} + with: + files: | + ./docker-bake.hcl + workdir: . + no-cache: true + push: ${{ github.event_name != 'pull_request' }} + targets: | + ${{ matrix.rosdistro }} + set: | + *.platform=linux/amd64 - - name: Build (arm64) + - name: Build and push (arm64) + uses: docker/bake-action@v3 if: ${{ matrix.runs_on == 'macos-14'}} - run: docker build -t ghcr.io/tier4/scenario_simulator_v2:${{ matrix.rosdistro }}_arm64 . --build-arg ROS_DISTRO=${{ matrix.rosdistro }} + with: + files: | + ./docker-bake.hcl + workdir: . + no-cache: true + push: ${{ github.event_name != 'pull_request' }} + targets: | + ${{ matrix.rosdistro }} + set: | + *.platform=linux/arm64/v8 From f18daa7eeeed8a2da38bab1cd41ea190670b7ba7 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 22 Feb 2024 15:12:07 +0900 Subject: [PATCH 50/85] Bake arm64 image with mimic-cross --- .github/workflows/Docker.yaml | 28 +++++------------------ Dockerfile.arm64 | 43 +++++++++++++++++++++++++++++++++++ docker-bake.hcl | 15 ++++++++---- 3 files changed, 60 insertions(+), 26 deletions(-) create mode 100644 Dockerfile.arm64 diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index f50690fc8e2..9c42e07b21d 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -6,12 +6,12 @@ on: - cron: 0 0 * * * pull_request: paths: - - '**' - - '!docs/**' - - '!README.md' - - '!.github/**' - - '.github/workflows/Docker.yaml' - - '!mkdocs.yml' + - "**" + - "!docs/**" + - "!README.md" + - "!.github/**" + - ".github/workflows/Docker.yaml" + - "!mkdocs.yml" push: branches: - master @@ -62,19 +62,3 @@ jobs: push: ${{ github.event_name != 'pull_request' }} targets: | ${{ matrix.rosdistro }} - set: | - *.platform=linux/amd64 - - - name: Build and push (arm64) - uses: docker/bake-action@v3 - if: ${{ matrix.runs_on == 'macos-14'}} - with: - files: | - ./docker-bake.hcl - workdir: . - no-cache: true - push: ${{ github.event_name != 'pull_request' }} - targets: | - ${{ matrix.rosdistro }} - set: | - *.platform=linux/arm64/v8 diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 new file mode 100644 index 00000000000..8c4daa18210 --- /dev/null +++ b/Dockerfile.arm64 @@ -0,0 +1,43 @@ +ARG ROS_DISTRO="humble" + +FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.0.1 AS mimic-host +FROM ros:${ROS_DISTRO} as build-stage + +SHELL ["/bin/bash", "-c"] +ENV DEBIAN_FRONTEND=noninteractive +ENV DEBCONF_NOWARNINGS=yes + +COPY --from=mimic-host / /mimic-cross +RUN /mimic-cross/mimic-cross.deno/setup.sh + +RUN sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache +# cspell: ignore kisak +RUN add-apt-repository ppa:kisak/kisak-mesa -y +RUN apt-get update && apt-get install libegl-mesa0 -y + +WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator +COPY . $WORKDIR + +WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/ +RUN mkdir -p /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/external +WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator +RUN vcs import external < dependency_${ROS_DISTRO}.repos +WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src +RUN source /opt/ros/${ROS_DISTRO}/setup.bash && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} + +WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws + +ENV CC="/usr/lib/ccache/gcc" +ENV CXX="/usr/lib/ccache/g++" +ENV CCACHE_DIR="/ccache" +RUN --mount=type=cache,target=/ccache source /opt/ros/${ROS_DISTRO}/setup.bash && \ + colcon build --symlink-install \ + --cmake-args \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -DBUILD_CPP_MOCK_SCENARIOS=ON +COPY ./docker-entrypoint.sh / +RUN chmod a+x /docker-entrypoint.sh + +ENTRYPOINT ["/docker-entrypoint.sh"] diff --git a/docker-bake.hcl b/docker-bake.hcl index e44c8f02961..9a533f986ee 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -5,14 +5,21 @@ group "default" { target "base" { target = "build-stage" dockerfile = "Dockerfile" - platforms = ["linux/amd64", "linux/arm64/v8"] + platforms = ["linux/amd64"] +} + +target "base_arm64" { + dockerfile = "Dockerfile.arm64" + platforms = ["linux/arm64/v8"] } target "humble" { - inherits = ["base"] - name = "humble" + inherits = [base] + name = "humble-${base}" tags = ["ghcr.io/tier4/scenario_simulator_v2:humble"] args = {"ROS_DISTRO" : "humble"} group = ["humble"] - matrix = {} + matrix = { + base = ["base", "base_arm64"] + } } From 83c40096d81defd349661879d8cc9e0313ce27db Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 22 Feb 2024 15:37:40 +0900 Subject: [PATCH 51/85] Install qemu to build container --- .github/workflows/Docker.yaml | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 9c42e07b21d..42f2956f55b 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -20,28 +20,18 @@ on: jobs: build_docker_image: name: Build Docker Image - runs-on: ${{ matrix.runs_on }} + runs-on: ubuntu-22.04 timeout-minutes: 720 strategy: matrix: rosdistro: [humble] - runs_on: [ubuntu-22.04, macos-14] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 steps: - - name: Install docker for mac runner - if: ${{ matrix.runs_on == 'macos-14'}} - run: | - brew install wget - wget https://download.docker.com/mac/static/stable/aarch64/docker-25.0.3.tgz - tar -xvzf docker-25.0.3.tgz - cp docker/docker /usr/local/bin/ - mkdir -p $HOME/.docker/cli-plugins - wget https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-arm64 -O $HOME/.docker/cli-plugins/docker-buildx - chmod a+x $HOME/.docker/cli-plugins/docker-buildx - - name: Install docker for ubuntu runner - if: ${{ matrix.runs_on == 'ubuntu-22.04' }} uses: docker/setup-buildx-action@v3 + - name: Install QEMU + uses: docker/setup-qemu-action@v3 + - uses: actions/checkout@v3 - name: Login to GitHub Container Registry @@ -53,7 +43,6 @@ jobs: - name: Build and push (amd64) uses: docker/bake-action@v3 - if: ${{ matrix.runs_on == 'ubuntu-22.04' }} with: files: | ./docker-bake.hcl From ea9ab34a869a965f2010f7f00d83ece200e6e068 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 22 Feb 2024 17:17:08 +0900 Subject: [PATCH 52/85] Remove ccache from arm64 build(temp) --- Dockerfile.arm64 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 8c4daa18210..c380b6b6466 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -27,15 +27,10 @@ RUN source /opt/ros/${ROS_DISTRO}/setup.bash && rosdep install -iy --from-paths WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws -ENV CC="/usr/lib/ccache/gcc" -ENV CXX="/usr/lib/ccache/g++" -ENV CCACHE_DIR="/ccache" -RUN --mount=type=cache,target=/ccache source /opt/ros/${ROS_DISTRO}/setup.bash && \ +RUN source /opt/ros/${ROS_DISTRO}/setup.bash && \ colcon build --symlink-install \ --cmake-args \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DBUILD_CPP_MOCK_SCENARIOS=ON COPY ./docker-entrypoint.sh / RUN chmod a+x /docker-entrypoint.sh From 70ae9758e7cff3656ec8c1745208501ab14d29f9 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 29 Feb 2024 12:08:09 +0900 Subject: [PATCH 53/85] Remove macos job in BuildAndRun --- .github/workflows/BuildAndRun.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/BuildAndRun.yaml b/.github/workflows/BuildAndRun.yaml index ff6e45ef847..7e7496e368a 100644 --- a/.github/workflows/BuildAndRun.yaml +++ b/.github/workflows/BuildAndRun.yaml @@ -6,14 +6,14 @@ on: - cron: 0 0 * * * pull_request: paths: - - '**' - - '!docs/**' - - '!README.md' - - '!.github/**' - - '.github/workflows/BuildAndRun.yaml' - - '!mkdocs.yml' - - '!pyproject.toml' - - '!poetry.lock' + - "**" + - "!docs/**" + - "!README.md" + - "!.github/**" + - ".github/workflows/BuildAndRun.yaml" + - "!mkdocs.yml" + - "!pyproject.toml" + - "!poetry.lock" push: branches: - master @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: rosdistro: [humble] - runs_on: [ubuntu-22.04, macos-14] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 + runs_on: [ubuntu-22.04] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20 steps: - name: Suppress warnings run: | From d75d249ff883a20d96eec30fc2cc720225d342b1 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 29 Feb 2024 12:56:53 +0900 Subject: [PATCH 54/85] Enable apt cache --- .github/workflows/Docker.yaml | 4 +++- Dockerfile | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 42f2956f55b..b88c38b2311 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -47,7 +47,9 @@ jobs: files: | ./docker-bake.hcl workdir: . - no-cache: true + set: | + *.cache-to=type=gha,mode=max + *.cache-from=type=gha push: ${{ github.event_name != 'pull_request' }} targets: | ${{ matrix.rosdistro }} diff --git a/Dockerfile b/Dockerfile index 85a8ddc3ee3..6baac344e64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,9 @@ RUN sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg py RUN add-apt-repository ppa:kisak/kisak-mesa -y RUN apt-get update && apt-get install libegl-mesa0 -y +RUN rm -f /etc/apt/apt.conf.d/docker-clean \ + echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache + WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator COPY . $WORKDIR @@ -17,7 +20,10 @@ RUN mkdir -p /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/e WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator RUN vcs import external < dependency_${ROS_DISTRO}.repos WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src -RUN source /opt/ros/${ROS_DISTRO}/setup.bash && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ + source /opt/ros/${ROS_DISTRO}/setup.bash \ + && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws @@ -26,11 +32,11 @@ ENV CXX="/usr/lib/ccache/g++" ENV CCACHE_DIR="/ccache" RUN --mount=type=cache,target=/ccache source /opt/ros/${ROS_DISTRO}/setup.bash && \ colcon build --symlink-install \ - --cmake-args \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DBUILD_CPP_MOCK_SCENARIOS=ON + --cmake-args \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -DBUILD_CPP_MOCK_SCENARIOS=ON COPY ./docker-entrypoint.sh / RUN chmod a+x /docker-entrypoint.sh From f0a28756780613eee61a0aba52bc08045a3120fd Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 29 Feb 2024 12:58:04 +0900 Subject: [PATCH 55/85] Update mimic-cross --- Dockerfile.arm64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index c380b6b6466..9bcce4b9105 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,6 +1,6 @@ ARG ROS_DISTRO="humble" -FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.0.1 AS mimic-host +FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.2.0 AS mimic-host FROM ros:${ROS_DISTRO} as build-stage SHELL ["/bin/bash", "-c"] From bc8f599983748a5e4ffaaad47536d87a8494684d Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 29 Feb 2024 13:02:30 +0900 Subject: [PATCH 56/85] Add apt cache to arm64 --- Dockerfile | 2 +- Dockerfile.arm64 | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6baac344e64..0b7e52ea54b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ RUN sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg py RUN add-apt-repository ppa:kisak/kisak-mesa -y RUN apt-get update && apt-get install libegl-mesa0 -y -RUN rm -f /etc/apt/apt.conf.d/docker-clean \ +RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 9bcce4b9105..4a1ad297d32 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -15,6 +15,9 @@ RUN sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg py RUN add-apt-repository ppa:kisak/kisak-mesa -y RUN apt-get update && apt-get install libegl-mesa0 -y +RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ + echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache + WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator COPY . $WORKDIR @@ -23,7 +26,10 @@ RUN mkdir -p /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/e WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator RUN vcs import external < dependency_${ROS_DISTRO}.repos WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src -RUN source /opt/ros/${ROS_DISTRO}/setup.bash && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ + source /opt/ros/${ROS_DISTRO}/setup.bash \ + && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws From 2270e9afb9e27995ce1b718151b4a6f55c29e5e1 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 29 Feb 2024 13:05:40 +0900 Subject: [PATCH 57/85] Run apt-get update on cache --- Dockerfile | 1 + Dockerfile.arm64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0b7e52ea54b..003892a0399 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,7 @@ WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ source /opt/ros/${ROS_DISTRO}/setup.bash \ + && apt-get update \ && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 4a1ad297d32..f0b86734dbf 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -29,6 +29,7 @@ WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ source /opt/ros/${ROS_DISTRO}/setup.bash \ + && apt-get update \ && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws From 4b06330638d82aa4fdd168d192a1543877860b94 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 29 Feb 2024 13:20:03 +0900 Subject: [PATCH 58/85] Use cache in every apt stage --- Dockerfile | 12 +++++++++--- Dockerfile.arm64 | 12 +++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 003892a0399..5544d007b37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,10 +4,16 @@ SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NOWARNINGS=yes -RUN sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ + apt-get update && apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache # cspell: ignore kisak -RUN add-apt-repository ppa:kisak/kisak-mesa -y -RUN apt-get update && apt-get install libegl-mesa0 -y +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ + add-apt-repository ppa:kisak/kisak-mesa -y +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ + apt-get update && apt-get install libegl-mesa0 -y RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index f0b86734dbf..7fb9b2d5319 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -10,10 +10,16 @@ ENV DEBCONF_NOWARNINGS=yes COPY --from=mimic-host / /mimic-cross RUN /mimic-cross/mimic-cross.deno/setup.sh -RUN sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ + sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache # cspell: ignore kisak -RUN add-apt-repository ppa:kisak/kisak-mesa -y -RUN apt-get update && apt-get install libegl-mesa0 -y +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ + add-apt-repository ppa:kisak/kisak-mesa -y +RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,target=/var/lib/apt,sharing=locked \ + apt-get update && apt-get install libegl-mesa0 -y RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache From 89477544cce642e6eb85bd24b707d6956d7e4b39 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 29 Feb 2024 13:31:29 +0900 Subject: [PATCH 59/85] Use different cache id --- Dockerfile | 16 ++++++++-------- Dockerfile.arm64 | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5544d007b37..66dac7baeb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,15 +4,15 @@ SHELL ["/bin/bash", "-c"] ENV DEBIAN_FRONTEND=noninteractive ENV DEBCONF_NOWARNINGS=yes -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ +RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \ apt-get update && apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache # cspell: ignore kisak -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ +RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \ add-apt-repository ppa:kisak/kisak-mesa -y -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ +RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \ apt-get update && apt-get install libegl-mesa0 -y RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ @@ -26,8 +26,8 @@ RUN mkdir -p /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/e WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator RUN vcs import external < dependency_${ROS_DISTRO}.repos WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ +RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \ source /opt/ros/${ROS_DISTRO}/setup.bash \ && apt-get update \ && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 7fb9b2d5319..f93f0f48f8f 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -10,15 +10,15 @@ ENV DEBCONF_NOWARNINGS=yes COPY --from=mimic-host / /mimic-cross RUN /mimic-cross/mimic-cross.deno/setup.sh -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ +RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ sudo apt-get update && sudo apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache # cspell: ignore kisak -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ +RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ add-apt-repository ppa:kisak/kisak-mesa -y -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ +RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ apt-get update && apt-get install libegl-mesa0 -y RUN rm -f /etc/apt/apt.conf.d/docker-clean && \ @@ -32,8 +32,8 @@ RUN mkdir -p /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator/e WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src/scenario_simulator RUN vcs import external < dependency_${ROS_DISTRO}.repos WORKDIR /home/ubuntu/Desktop/scenario_simulator_ws/src -RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ - --mount=type=cache,target=/var/lib/apt,sharing=locked \ +RUN --mount=type=cache,id=apt-cache-arm64,target=/var/cache/apt,sharing=locked \ + --mount=type=cache,id=apt-lib-arm64,target=/var/lib/apt,sharing=locked \ source /opt/ros/${ROS_DISTRO}/setup.bash \ && apt-get update \ && rosdep install -iy --from-paths . --rosdistro ${ROS_DISTRO} From e9d03e5d61c26d160eaa7771fe0d66cf61a5470b Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 29 Feb 2024 13:58:10 +0900 Subject: [PATCH 60/85] Downgrade mimic-cross --- Dockerfile.arm64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index f93f0f48f8f..b6cba8c967a 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,6 +1,6 @@ ARG ROS_DISTRO="humble" -FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.2.0 AS mimic-host +FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.1.0 AS mimic-host FROM ros:${ROS_DISTRO} as build-stage SHELL ["/bin/bash", "-c"] From 3540e567d2db377712a54bd89b072fe25f445f0d Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 29 Feb 2024 16:44:31 +0900 Subject: [PATCH 61/85] Use matrix to build image --- .github/workflows/Docker.yaml | 10 ++++++++-- docker-bake.hcl | 7 ++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index b88c38b2311..7da8203b750 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -25,7 +25,13 @@ jobs: strategy: matrix: rosdistro: [humble] + arch: [amd64, arm64] steps: + - name: Free Disk Space (Ubuntu) + uses: jlumbroso/free-disk-space@main + with: + tool-cache: false + - name: Install docker for ubuntu runner uses: docker/setup-buildx-action@v3 @@ -50,6 +56,6 @@ jobs: set: | *.cache-to=type=gha,mode=max *.cache-from=type=gha - push: ${{ github.event_name != 'pull_request' }} + push: ${{ github.event_name != 'pull_request' && matrix.arch == 'amd64' }} targets: | - ${{ matrix.rosdistro }} + ${{ matrix.rosdistro }}_base_${{ matrix.arch }} diff --git a/docker-bake.hcl b/docker-bake.hcl index 9a533f986ee..fac2c5237a4 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -2,24 +2,25 @@ group "default" { targets = ["humble"] } -target "base" { +target "base_amd64" { target = "build-stage" dockerfile = "Dockerfile" platforms = ["linux/amd64"] } target "base_arm64" { + target = "build-stage" dockerfile = "Dockerfile.arm64" platforms = ["linux/arm64/v8"] } target "humble" { inherits = [base] - name = "humble-${base}" + name = "humble_${base}" tags = ["ghcr.io/tier4/scenario_simulator_v2:humble"] args = {"ROS_DISTRO" : "humble"} group = ["humble"] matrix = { - base = ["base", "base_arm64"] + base = ["base_amd64", "base_arm64"] } } From 89102da17fd7297dac6d6afd34be56e792644742 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 28 Mar 2024 11:49:42 +0900 Subject: [PATCH 62/85] Fix workflow step name --- .github/workflows/Docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml index 7da8203b750..150e6778d61 100644 --- a/.github/workflows/Docker.yaml +++ b/.github/workflows/Docker.yaml @@ -47,7 +47,7 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push (amd64) + - name: Build and push (${{ matrix.arch }}) uses: docker/bake-action@v3 with: files: | From 962b857cb942fa288b133a962bfa8ea9ba649962 Mon Sep 17 00:00:00 2001 From: f0reachARR Date: Thu, 28 Mar 2024 11:57:23 +0900 Subject: [PATCH 63/85] Fix cspell error --- Dockerfile.arm64 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index b6cba8c967a..ff997f01684 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,5 +1,7 @@ ARG ROS_DISTRO="humble" +# cspell: ignore impactaky deno BUILDPLATFORM TARGETARCH + FROM --platform=${BUILDPLATFORM} impactaky/mc-ubuntu22.04-${TARGETARCH}-host:2.1.0 AS mimic-host FROM ros:${ROS_DISTRO} as build-stage From ed3dbce394e1e5b918d8c396ab3a0c8a85a1a188 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 29 Mar 2024 16:02:51 +0900 Subject: [PATCH 64/85] update repos file Signed-off-by: Masaya Kataoka --- dependency_humble.repos | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dependency_humble.repos b/dependency_humble.repos index 74b01c39442..831241efebb 100644 --- a/dependency_humble.repos +++ b/dependency_humble.repos @@ -23,7 +23,3 @@ repositories: type: git url: https://github.com/tier4/tier4_autoware_msgs.git version: tier4/universe # for Autoware.Universe (TIER IV) - embree_vendor: - type: git - url: https://github.com/tier4/embree_vendor.git - version: master From da40e34efccd91f25d468d2ed18343d5282a4f83 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 29 Mar 2024 16:03:53 +0900 Subject: [PATCH 65/85] add embree_vendor package to the repository Signed-off-by: Masaya Kataoka --- .gitignore | 1 + .../.github/workflows/BuildTest.yaml | 122 +++++++++++ .../.github/workflows/Docker.yaml | 0 .../.github/workflows/docker/.gitignore | 1 + .../.github/workflows/docker/Dockerfile | 16 ++ .../.github/workflows/docker/docker-bake.hcl | 12 ++ external/embree_vendor/.gitignore | 2 + external/embree_vendor/CHANGELOG.rst | 79 +++++++ external/embree_vendor/CMakeLists.txt | 53 +++++ external/embree_vendor/CONTRIBUTING.md | 3 + external/embree_vendor/LICENSE | 201 ++++++++++++++++++ external/embree_vendor/README.md | 3 + external/embree_vendor/dependency.repos | 1 + external/embree_vendor/package.xml | 21 ++ 14 files changed, 515 insertions(+) create mode 100644 external/embree_vendor/.github/workflows/BuildTest.yaml create mode 100644 external/embree_vendor/.github/workflows/Docker.yaml create mode 100644 external/embree_vendor/.github/workflows/docker/.gitignore create mode 100644 external/embree_vendor/.github/workflows/docker/Dockerfile create mode 100644 external/embree_vendor/.github/workflows/docker/docker-bake.hcl create mode 100644 external/embree_vendor/.gitignore create mode 100644 external/embree_vendor/CHANGELOG.rst create mode 100644 external/embree_vendor/CMakeLists.txt create mode 100644 external/embree_vendor/CONTRIBUTING.md create mode 100644 external/embree_vendor/LICENSE create mode 100644 external/embree_vendor/README.md create mode 100644 external/embree_vendor/dependency.repos create mode 100644 external/embree_vendor/package.xml diff --git a/.gitignore b/.gitignore index 665a3b4b50c..b06f5fabf95 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ log # external packages external/* !external/concealer +!external/embree_vendor # auto-generated files html diff --git a/external/embree_vendor/.github/workflows/BuildTest.yaml b/external/embree_vendor/.github/workflows/BuildTest.yaml new file mode 100644 index 00000000000..c350d3e0f8d --- /dev/null +++ b/external/embree_vendor/.github/workflows/BuildTest.yaml @@ -0,0 +1,122 @@ +name: BuildTest + +on: + schedule: + - cron: 0 0 * * * + pull_request: + workflow_dispatch: + +jobs: + build: + name: build + runs-on: ubuntu-22.04 + timeout-minutes: 180 + strategy: + fail-fast: false + max-parallel: 8 + matrix: + rosdistro: [humble] + include: + # Galactic Geochelone (May 2021 - November 2022) + # - docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-galactic-ros-base-latest + # rosdistro: galactic + # Humble Hawksbill (May 2022 - May 2027) + - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest + rosdistro: humble + # Rolling Ridley + # - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest + # rosdistro: rolling + env: + ROS_DISTRO: ${{ matrix.rosdistro }} + container: + image: ${{ matrix.docker_image }} + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: workaround for jammy + if: ${{ matrix.rosdistro == 'humble' }} + run: | + apt remove libunwind-14-dev -y + apt install python3-nose -y + pip uninstall nose -y + - name: install ccache + run: | + apt install -y ccache + - name: Make ccache dir + run: | + mkdir -p /tmp/ccache + - uses: actions/cache@v3 + with: + path: /tmp/ccache + key: ccache-${{ matrix.rosdistro }} + - name: Search packages in this repository + id: list_packages + run: | + echo ::set-output name=package_list::$(colcon list --names-only | sed -e ':loop; N; $!b loop; s/\n/ /g') + - name: Show target packages + run: | + echo "Target packages: ${{ steps.list_packages.outputs.package_list }}" + - name: Check dependency-${{ matrix.rosdistro }}.repos existence + id: check_rosdistro_repos_files + uses: andstor/file-existence-action@v1 + with: + files: dependency-${{ matrix.rosdistro }}.repos + allow_failure: false + - name: Check dependency.repos existence + id: check_repos_files + uses: andstor/file-existence-action@v1 + with: + files: dependency.repos + allow_failure: false + - name: Run build test with dependency-${{ matrix.rosdistro }}.repos + uses: ros-tooling/action-ros-ci@v0.3 + if: steps.check_rosdistro_repos_files.outputs.files_exists == 'true' + with: + package-name: ${{ steps.list_packages.outputs.package_list }} + target-ros2-distro: ${{ matrix.rosdistro }} + vcs-repo-file-url: dependency-${{ matrix.rosdistro }}.repos + extra-cmake-args: -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + env: + CCACHE_DIR: /tmp/ccache + DEVELOP: true + - name: Run build test with dependency.repos + uses: ros-tooling/action-ros-ci@v0.3 + if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'true' + with: + package-name: ${{ steps.list_packages.outputs.package_list }} + target-ros2-distro: ${{ matrix.rosdistro }} + vcs-repo-file-url: dependency.repos + extra-cmake-args: -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + env: + CCACHE_DIR: /tmp/ccache + DEVELOP: true + - name: Run build test without .repos file + uses: ros-tooling/action-ros-ci@v0.3 + if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'false' + with: + package-name: ${{ steps.list_packages.outputs.package_list }} + target-ros2-distro: ${{ matrix.rosdistro }} + extra-cmake-args: -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache + env: + CCACHE_DIR: /tmp/ccache + DEVELOP: true + - name: Notify Slack + uses: 8398a7/action-slack@v2 + if: failure() + with: + status: ${{ job.status }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} + merge: + name: merge + runs-on: ubuntu-22.04 + timeout-minutes: 180 + needs: build + steps: + - name: merge PR + if : ${{ (github.event_name == 'pull_request') && (github.actor == 'wam-v-tan') }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: gh pr merge ${{ github.event.pull_request.html_url }} --merge diff --git a/external/embree_vendor/.github/workflows/Docker.yaml b/external/embree_vendor/.github/workflows/Docker.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/external/embree_vendor/.github/workflows/docker/.gitignore b/external/embree_vendor/.github/workflows/docker/.gitignore new file mode 100644 index 00000000000..7bd80e846e7 --- /dev/null +++ b/external/embree_vendor/.github/workflows/docker/.gitignore @@ -0,0 +1 @@ +embree_vendor diff --git a/external/embree_vendor/.github/workflows/docker/Dockerfile b/external/embree_vendor/.github/workflows/docker/Dockerfile new file mode 100644 index 00000000000..920830feee7 --- /dev/null +++ b/external/embree_vendor/.github/workflows/docker/Dockerfile @@ -0,0 +1,16 @@ +ARG ROS_DISTRO=humble +FROM ros:${ROS_DISTRO} as build-stage +RUN mkdir -p /colcon_ws/src +WORKDIR /colcon_ws/src +COPY embree_vendor . +RUN echo "repositories:" > dependency_empty.repos +ARG DEPENDENCY_REPOS=dependency_empty.repos +RUN vcs import . < ${DEPENDENCY_REPOS} +WORKDIR /colcon_ws +RUN apt-get update && \ + rosdep install -iry --from-paths src && \ + apt-get clean \ + && rm -rf /var/lib/apt/lists/* +SHELL ["/bin/bash", "-c"] +RUN source /opt/ros/${ROS_DISTRO}/setup.bash && colcon build --symlink-install +RUN source /opt/ros/${ROS_DISTRO}/setup.bash && colcon test diff --git a/external/embree_vendor/.github/workflows/docker/docker-bake.hcl b/external/embree_vendor/.github/workflows/docker/docker-bake.hcl new file mode 100644 index 00000000000..c2b33cacb9c --- /dev/null +++ b/external/embree_vendor/.github/workflows/docker/docker-bake.hcl @@ -0,0 +1,12 @@ +group "default" { + targets = ["build"] +} + +target "build" { + target = "build-stage" + tags = ["embree_vendor"] + args = { + "ROS_DISTRO" : "humble" + } + platforms = ["linux/amd64", "linux/arm64/v8"] +} diff --git a/external/embree_vendor/.gitignore b/external/embree_vendor/.gitignore new file mode 100644 index 00000000000..12db48757d4 --- /dev/null +++ b/external/embree_vendor/.gitignore @@ -0,0 +1,2 @@ +debian +obj-x86_64-linux-gnu \ No newline at end of file diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst new file mode 100644 index 00000000000..d2642971d90 --- /dev/null +++ b/external/embree_vendor/CHANGELOG.rst @@ -0,0 +1,79 @@ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Changelog for package embree_vendor +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +0.0.9 (2021-07-13) +------------------ + +0.1.0 (2021-07-14) +------------------ +* Merge branch 'master' of https://github.com/OUXT-Polaris/embree_vendor +* Merge pull request `#4 `_ from OUXT-Polaris/feature/onetbb_src + Feature/onetbb src +* change build order +* remove unused action +* add tbb build command +* fix version +* Contributors: Masaya Kataoka + +0.8.1 (2021-07-13) +------------------ +* add pkg-config to the depends +* Contributors: Masaya Kataoka + +0.0.8 (2021-07-12) +------------------ +* fix embree version +* Contributors: Masaya Kataoka + +0.0.7 (2021-07-12) +------------------ +* remove test lines +* Merge pull request `#3 `_ from OUXT-Polaris/workflow/galactic + update CI workflow for galactic +* update .github/workflows/ROS2-Galactic.yaml +* Merge pull request `#2 `_ from OUXT-Polaris/workflow/foxy + update CI workflow for foxy +* update .github/workflows/ROS2-Foxy.yaml +* update dependency.repos +* add workflow_dispatch trigger +* Contributors: Masaya Kataoka, robotx_buildfarm + +0.0.6 (2021-01-10) +------------------ +* Merge pull request `#1 `_ from OUXT-Polaris/feature/add_tbb_to_depends + update package.xml +* update package.xml +* update workflow +* rename workflow +* fix workflow +* add generate foxy dpkg workflow +* Contributors: Masaya Kataoka + +0.0.5 (2021-01-04) +------------------ +* update LICENSE +* add ignore +* Contributors: Masaya Kataoka + +0.0.4 (2021-01-03) +------------------ +* update release workflow +* Contributors: Masaya Kataoka + +0.0.2 (2021-01-03) +------------------ +* update version +* update version tag +* update version +* add description +* add Release action +* fix xml tag +* add libglfw3-dev to the depends +* update workflow +* add README.md +* Create ROS2-Foxy.yaml + adding ROS2-Foxy workflow +* update instal dir +* enable pass rostest +* Contributors: Masaya Kataoka diff --git a/external/embree_vendor/CMakeLists.txt b/external/embree_vendor/CMakeLists.txt new file mode 100644 index 00000000000..9b2ebb8acd7 --- /dev/null +++ b/external/embree_vendor/CMakeLists.txt @@ -0,0 +1,53 @@ +cmake_minimum_required(VERSION 3.5) +project(embree_vendor) + +# Default to C99 +if(NOT CMAKE_C_STANDARD) + set(CMAKE_C_STANDARD 99) +endif() + +# Default to C++14 +if(NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 14) +endif() + +if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") + add_compile_options(-Wall -Wextra -Wpedantic) +endif() + +# find dependencies +find_package(ament_cmake REQUIRED) + +macro(build_embree) + + set(cmake_commands) + set(cmake_configure_args + -Wno-dev + -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_install + -DEMBREE_ISPC_SUPPORT=OFF) + + include(ExternalProject) + externalproject_add(embree-ext + GIT_REPOSITORY https://github.com/embree/embree.git + GIT_TAG v4.1.0 + TIMEOUT 6000 + ${cmake_commands} + CMAKE_ARGS + ${cmake_configure_args} + ) + + # The external project will install to the build folder, but we'll install that on make install. + install( + DIRECTORY + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_install/ + DESTINATION + ${CMAKE_INSTALL_PREFIX} + ) +endmacro() + +build_embree() + +ament_export_include_directories(include) +ament_export_libraries(embree4) + +ament_package() diff --git a/external/embree_vendor/CONTRIBUTING.md b/external/embree_vendor/CONTRIBUTING.md new file mode 100644 index 00000000000..3e89a7de75e --- /dev/null +++ b/external/embree_vendor/CONTRIBUTING.md @@ -0,0 +1,3 @@ +Any contribution that you make to this repository will +be under the MIT license, as dictated by that +[license](https://opensource.org/licenses/MIT). \ No newline at end of file diff --git a/external/embree_vendor/LICENSE b/external/embree_vendor/LICENSE new file mode 100644 index 00000000000..f49a4e16e68 --- /dev/null +++ b/external/embree_vendor/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/external/embree_vendor/README.md b/external/embree_vendor/README.md new file mode 100644 index 00000000000..71ef1e10ef5 --- /dev/null +++ b/external/embree_vendor/README.md @@ -0,0 +1,3 @@ +# embree_vendor + +vendor package for ray-tracing library made by Intel. (https://github.com/embree/embree) diff --git a/external/embree_vendor/dependency.repos b/external/embree_vendor/dependency.repos new file mode 100644 index 00000000000..c22e013adc8 --- /dev/null +++ b/external/embree_vendor/dependency.repos @@ -0,0 +1 @@ +repositories: \ No newline at end of file diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml new file mode 100644 index 00000000000..b6a284d4c3a --- /dev/null +++ b/external/embree_vendor/package.xml @@ -0,0 +1,21 @@ + + + + embree_vendor + 0.1.0 + vendor packages for intel raytracing kernel library + masaya + Apache 2.0 + + ament_cmake + libglfw3-dev + pkg-config + tbb + + ament_lint_auto + ament_lint_common + + + ament_cmake + + From f245e19c220632bbead70afab0a1a6a5d33c99f9 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 29 Mar 2024 16:05:20 +0900 Subject: [PATCH 66/85] remove unused .github directory Signed-off-by: Masaya Kataoka --- .../.github/workflows/BuildTest.yaml | 122 ------------------ .../.github/workflows/Docker.yaml | 0 .../.github/workflows/docker/.gitignore | 1 - .../.github/workflows/docker/Dockerfile | 16 --- .../.github/workflows/docker/docker-bake.hcl | 12 -- 5 files changed, 151 deletions(-) delete mode 100644 external/embree_vendor/.github/workflows/BuildTest.yaml delete mode 100644 external/embree_vendor/.github/workflows/Docker.yaml delete mode 100644 external/embree_vendor/.github/workflows/docker/.gitignore delete mode 100644 external/embree_vendor/.github/workflows/docker/Dockerfile delete mode 100644 external/embree_vendor/.github/workflows/docker/docker-bake.hcl diff --git a/external/embree_vendor/.github/workflows/BuildTest.yaml b/external/embree_vendor/.github/workflows/BuildTest.yaml deleted file mode 100644 index c350d3e0f8d..00000000000 --- a/external/embree_vendor/.github/workflows/BuildTest.yaml +++ /dev/null @@ -1,122 +0,0 @@ -name: BuildTest - -on: - schedule: - - cron: 0 0 * * * - pull_request: - workflow_dispatch: - -jobs: - build: - name: build - runs-on: ubuntu-22.04 - timeout-minutes: 180 - strategy: - fail-fast: false - max-parallel: 8 - matrix: - rosdistro: [humble] - include: - # Galactic Geochelone (May 2021 - November 2022) - # - docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-galactic-ros-base-latest - # rosdistro: galactic - # Humble Hawksbill (May 2022 - May 2027) - - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest - rosdistro: humble - # Rolling Ridley - # - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest - # rosdistro: rolling - env: - ROS_DISTRO: ${{ matrix.rosdistro }} - container: - image: ${{ matrix.docker_image }} - steps: - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: workaround for jammy - if: ${{ matrix.rosdistro == 'humble' }} - run: | - apt remove libunwind-14-dev -y - apt install python3-nose -y - pip uninstall nose -y - - name: install ccache - run: | - apt install -y ccache - - name: Make ccache dir - run: | - mkdir -p /tmp/ccache - - uses: actions/cache@v3 - with: - path: /tmp/ccache - key: ccache-${{ matrix.rosdistro }} - - name: Search packages in this repository - id: list_packages - run: | - echo ::set-output name=package_list::$(colcon list --names-only | sed -e ':loop; N; $!b loop; s/\n/ /g') - - name: Show target packages - run: | - echo "Target packages: ${{ steps.list_packages.outputs.package_list }}" - - name: Check dependency-${{ matrix.rosdistro }}.repos existence - id: check_rosdistro_repos_files - uses: andstor/file-existence-action@v1 - with: - files: dependency-${{ matrix.rosdistro }}.repos - allow_failure: false - - name: Check dependency.repos existence - id: check_repos_files - uses: andstor/file-existence-action@v1 - with: - files: dependency.repos - allow_failure: false - - name: Run build test with dependency-${{ matrix.rosdistro }}.repos - uses: ros-tooling/action-ros-ci@v0.3 - if: steps.check_rosdistro_repos_files.outputs.files_exists == 'true' - with: - package-name: ${{ steps.list_packages.outputs.package_list }} - target-ros2-distro: ${{ matrix.rosdistro }} - vcs-repo-file-url: dependency-${{ matrix.rosdistro }}.repos - extra-cmake-args: -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - env: - CCACHE_DIR: /tmp/ccache - DEVELOP: true - - name: Run build test with dependency.repos - uses: ros-tooling/action-ros-ci@v0.3 - if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'true' - with: - package-name: ${{ steps.list_packages.outputs.package_list }} - target-ros2-distro: ${{ matrix.rosdistro }} - vcs-repo-file-url: dependency.repos - extra-cmake-args: -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - env: - CCACHE_DIR: /tmp/ccache - DEVELOP: true - - name: Run build test without .repos file - uses: ros-tooling/action-ros-ci@v0.3 - if: steps.check_rosdistro_repos_files.outputs.files_exists == 'false' && steps.check_repos_files.outputs.files_exists == 'false' - with: - package-name: ${{ steps.list_packages.outputs.package_list }} - target-ros2-distro: ${{ matrix.rosdistro }} - extra-cmake-args: -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - env: - CCACHE_DIR: /tmp/ccache - DEVELOP: true - - name: Notify Slack - uses: 8398a7/action-slack@v2 - if: failure() - with: - status: ${{ job.status }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - merge: - name: merge - runs-on: ubuntu-22.04 - timeout-minutes: 180 - needs: build - steps: - - name: merge PR - if : ${{ (github.event_name == 'pull_request') && (github.actor == 'wam-v-tan') }} - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: gh pr merge ${{ github.event.pull_request.html_url }} --merge diff --git a/external/embree_vendor/.github/workflows/Docker.yaml b/external/embree_vendor/.github/workflows/Docker.yaml deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/external/embree_vendor/.github/workflows/docker/.gitignore b/external/embree_vendor/.github/workflows/docker/.gitignore deleted file mode 100644 index 7bd80e846e7..00000000000 --- a/external/embree_vendor/.github/workflows/docker/.gitignore +++ /dev/null @@ -1 +0,0 @@ -embree_vendor diff --git a/external/embree_vendor/.github/workflows/docker/Dockerfile b/external/embree_vendor/.github/workflows/docker/Dockerfile deleted file mode 100644 index 920830feee7..00000000000 --- a/external/embree_vendor/.github/workflows/docker/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -ARG ROS_DISTRO=humble -FROM ros:${ROS_DISTRO} as build-stage -RUN mkdir -p /colcon_ws/src -WORKDIR /colcon_ws/src -COPY embree_vendor . -RUN echo "repositories:" > dependency_empty.repos -ARG DEPENDENCY_REPOS=dependency_empty.repos -RUN vcs import . < ${DEPENDENCY_REPOS} -WORKDIR /colcon_ws -RUN apt-get update && \ - rosdep install -iry --from-paths src && \ - apt-get clean \ - && rm -rf /var/lib/apt/lists/* -SHELL ["/bin/bash", "-c"] -RUN source /opt/ros/${ROS_DISTRO}/setup.bash && colcon build --symlink-install -RUN source /opt/ros/${ROS_DISTRO}/setup.bash && colcon test diff --git a/external/embree_vendor/.github/workflows/docker/docker-bake.hcl b/external/embree_vendor/.github/workflows/docker/docker-bake.hcl deleted file mode 100644 index c2b33cacb9c..00000000000 --- a/external/embree_vendor/.github/workflows/docker/docker-bake.hcl +++ /dev/null @@ -1,12 +0,0 @@ -group "default" { - targets = ["build"] -} - -target "build" { - target = "build-stage" - tags = ["embree_vendor"] - args = { - "ROS_DISTRO" : "humble" - } - platforms = ["linux/amd64", "linux/arm64/v8"] -} From 647c36f3b13c37939502cb51a4ecaaf2e5176902 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 29 Mar 2024 16:07:54 +0900 Subject: [PATCH 67/85] remove unused files Signed-off-by: Masaya Kataoka --- external/embree_vendor/.gitignore | 2 +- external/embree_vendor/CONTRIBUTING.md | 3 - external/embree_vendor/LICENSE | 201 ------------------------ external/embree_vendor/dependency.repos | 1 - 4 files changed, 1 insertion(+), 206 deletions(-) delete mode 100644 external/embree_vendor/CONTRIBUTING.md delete mode 100644 external/embree_vendor/LICENSE delete mode 100644 external/embree_vendor/dependency.repos diff --git a/external/embree_vendor/.gitignore b/external/embree_vendor/.gitignore index 12db48757d4..9ce007f53e1 100644 --- a/external/embree_vendor/.gitignore +++ b/external/embree_vendor/.gitignore @@ -1,2 +1,2 @@ debian -obj-x86_64-linux-gnu \ No newline at end of file +obj-x86_64-linux-gnu diff --git a/external/embree_vendor/CONTRIBUTING.md b/external/embree_vendor/CONTRIBUTING.md deleted file mode 100644 index 3e89a7de75e..00000000000 --- a/external/embree_vendor/CONTRIBUTING.md +++ /dev/null @@ -1,3 +0,0 @@ -Any contribution that you make to this repository will -be under the MIT license, as dictated by that -[license](https://opensource.org/licenses/MIT). \ No newline at end of file diff --git a/external/embree_vendor/LICENSE b/external/embree_vendor/LICENSE deleted file mode 100644 index f49a4e16e68..00000000000 --- a/external/embree_vendor/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/external/embree_vendor/dependency.repos b/external/embree_vendor/dependency.repos deleted file mode 100644 index c22e013adc8..00000000000 --- a/external/embree_vendor/dependency.repos +++ /dev/null @@ -1 +0,0 @@ -repositories: \ No newline at end of file From c8a95048093847308b5e21a3cd2bd0f22b827bf8 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 29 Mar 2024 16:09:04 +0900 Subject: [PATCH 68/85] update version Signed-off-by: Masaya Kataoka --- external/embree_vendor/package.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml index b6a284d4c3a..987a14a2bee 100644 --- a/external/embree_vendor/package.xml +++ b/external/embree_vendor/package.xml @@ -2,7 +2,7 @@ embree_vendor - 0.1.0 + 1.10.0 vendor packages for intel raytracing kernel library masaya Apache 2.0 From 100b774fd14f110e808a2e6fa52f7c5ebbee6ced Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Wed, 26 Apr 2023 10:04:28 +0900 Subject: [PATCH 69/85] refactor(openscenario_interpreter): delete ros messages from basic types --- .../include/openscenario_interpreter/syntax/double.hpp | 7 ++++--- .../include/openscenario_interpreter/syntax/integer.hpp | 9 +++++---- .../openscenario_interpreter/syntax/unsigned_integer.hpp | 7 ++++--- .../openscenario_interpreter/syntax/unsigned_short.hpp | 7 ++++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp index 13b02b4caac..747d48ccac5 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp @@ -15,16 +15,17 @@ #ifndef OPENSCENARIO_INTERPRETER__SYNTAX__DOUBLE_HPP_ #define OPENSCENARIO_INTERPRETER__SYNTAX__DOUBLE_HPP_ -#include #include namespace openscenario_interpreter { inline namespace syntax { -struct Double : public std_msgs::msg::Float64 +struct Double { - using value_type = decltype(std_msgs::msg::Float64::data); + using value_type = double; + + value_type data = 0.0; Double() = default; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp index 9c090abe082..afaf8f073d0 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp @@ -15,18 +15,19 @@ #ifndef OPENSCENARIO_INTERPRETER__SYNTAX__INTEGER_HPP_ #define OPENSCENARIO_INTERPRETER__SYNTAX__INTEGER_HPP_ -#include #include -#include +#include #include namespace openscenario_interpreter { inline namespace syntax { -struct Integer : public std_msgs::msg::Int64 +struct Integer { - using value_type = decltype(std_msgs::msg::Int64::data); + using value_type = std::int64_t; + + value_type data = 0; explicit Integer() = default; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp index fe2e8cf51eb..e0a73d29f09 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp @@ -17,16 +17,17 @@ #include #include -#include #include namespace openscenario_interpreter { inline namespace syntax { -struct UnsignedInteger : public std_msgs::msg::UInt64 +struct UnsignedInteger { - using value_type = decltype(std_msgs::msg::UInt64::data); + using value_type = std::uint64_t; + + value_type data; explicit UnsignedInteger(value_type value = {}); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp index 3f9c5f57a91..73b4bc34455 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp @@ -16,16 +16,17 @@ #define OPENSCENARIO_INTERPRETER__SYNTAX__UNSIGNED_SHORT_HPP_ #include -#include #include namespace openscenario_interpreter { inline namespace syntax { -struct UnsignedShort : public std_msgs::msg::UInt16 +struct UnsignedShort { - using value_type = decltype(std_msgs::msg::UInt16::data); + using value_type = std::uint16_t; + + value_type data = 0U; explicit UnsignedShort() = default; From b0a5e7560d642f7c7272cb382969f6e3c2ec2bc0 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Mon, 1 Apr 2024 15:17:27 +0900 Subject: [PATCH 70/85] chore: apply linter --- .../include/openscenario_interpreter/syntax/integer.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp index afaf8f073d0..aa50692211d 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp @@ -15,8 +15,8 @@ #ifndef OPENSCENARIO_INTERPRETER__SYNTAX__INTEGER_HPP_ #define OPENSCENARIO_INTERPRETER__SYNTAX__INTEGER_HPP_ -#include #include +#include #include namespace openscenario_interpreter From 8b6944028c5a4b04a421f91b0c00f124fefd3fd5 Mon Sep 17 00:00:00 2001 From: Release Bot Date: Tue, 2 Apr 2024 07:54:29 +0000 Subject: [PATCH 71/85] Bump version of scenario_simulator_v2 from version 1.10.0 to version 1.11.0 --- common/math/arithmetic/CHANGELOG.rst | 8 ++++++++ common/math/arithmetic/package.xml | 2 +- common/math/geometry/CHANGELOG.rst | 8 ++++++++ common/math/geometry/package.xml | 2 +- .../CHANGELOG.rst | 9 +++++++++ .../scenario_simulator_exception/package.xml | 2 +- common/simple_junit/CHANGELOG.rst | 9 +++++++++ common/simple_junit/package.xml | 2 +- common/status_monitor/CHANGELOG.rst | 8 ++++++++ common/status_monitor/package.xml | 2 +- external/concealer/CHANGELOG.rst | 9 +++++++++ external/concealer/package.xml | 2 +- external/embree_vendor/CHANGELOG.rst | 10 ++++++++++ external/embree_vendor/package.xml | 2 +- map/kashiwanoha_map/CHANGELOG.rst | 8 ++++++++ map/kashiwanoha_map/package.xml | 2 +- mock/cpp_mock_scenarios/CHANGELOG.rst | 9 +++++++++ mock/cpp_mock_scenarios/package.xml | 2 +- .../CHANGELOG.rst | 8 ++++++++ .../package.xml | 2 +- .../openscenario_interpreter/CHANGELOG.rst | 9 +++++++++ .../openscenario_interpreter/package.xml | 2 +- .../CHANGELOG.rst | 8 ++++++++ .../package.xml | 2 +- .../CHANGELOG.rst | 8 ++++++++ .../openscenario_interpreter_msgs/package.xml | 2 +- .../openscenario_preprocessor/CHANGELOG.rst | 9 +++++++++ .../openscenario_preprocessor/package.xml | 2 +- .../CHANGELOG.rst | 8 ++++++++ .../package.xml | 2 +- .../openscenario_utility/CHANGELOG.rst | 8 ++++++++ openscenario/openscenario_utility/package.xml | 2 +- .../openscenario_visualization/CHANGELOG.rst | 8 ++++++++ .../openscenario_visualization/package.xml | 2 +- .../CHANGELOG.rst | 7 +++++++ .../package.xml | 2 +- scenario_simulator_v2/CHANGELOG.rst | 8 ++++++++ scenario_simulator_v2/package.xml | 2 +- simulation/behavior_tree_plugin/CHANGELOG.rst | 9 +++++++++ simulation/behavior_tree_plugin/package.xml | 2 +- simulation/do_nothing_plugin/CHANGELOG.rst | 9 +++++++++ simulation/do_nothing_plugin/package.xml | 2 +- .../simple_sensor_simulator/CHANGELOG.rst | 19 +++++++++++++++++++ .../simple_sensor_simulator/package.xml | 2 +- simulation/simulation_interface/CHANGELOG.rst | 8 ++++++++ simulation/simulation_interface/package.xml | 2 +- simulation/traffic_simulator/CHANGELOG.rst | 10 ++++++++++ simulation/traffic_simulator/package.xml | 2 +- .../traffic_simulator_msgs/CHANGELOG.rst | 8 ++++++++ simulation/traffic_simulator_msgs/package.xml | 2 +- test_runner/random_test_runner/CHANGELOG.rst | 9 +++++++++ test_runner/random_test_runner/package.xml | 2 +- .../scenario_test_runner/CHANGELOG.rst | 13 +++++++++++++ test_runner/scenario_test_runner/package.xml | 2 +- 54 files changed, 271 insertions(+), 27 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 9387395f678..35a55c949b7 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package arithmetic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index d7c8fbfff97..316fe13c81d 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 1.10.0 + 1.11.0 arithmetic library for scenario_simulator_v2 Tatsuya Yamasaki Apache License 2.0 diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst index b903b6ea3ba..de2e823c9a9 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package geometry ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index d087cbab749..f42380a365e 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 1.10.0 + 1.11.0 geometry math library for scenario_simulator_v2 application Masaya Kataoka Apache License 2.0 diff --git a/common/scenario_simulator_exception/CHANGELOG.rst b/common/scenario_simulator_exception/CHANGELOG.rst index 12ea9bb8dd0..075b92c9197 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package scenario_simulator_exception ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 10188878ddb..94ca86eacdf 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 1.10.0 + 1.11.0 Exception types for scenario simulator Tatsuya Yamasaki Apache License 2.0 diff --git a/common/simple_junit/CHANGELOG.rst b/common/simple_junit/CHANGELOG.rst index 55704fe2b01..8c793ffaafc 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package junit_exporter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index d6dbad05c0d..5a6a6294cef 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 1.10.0 + 1.11.0 Lightweight JUnit library for ROS 2 Masaya Kataoka Tatsuya Yamasaki diff --git a/common/status_monitor/CHANGELOG.rst b/common/status_monitor/CHANGELOG.rst index 7fac272bf2a..0db7c594b6c 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package status_monitor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 7bc45cf59f4..9932a001497 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 1.10.0 + 1.11.0 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index b4d65e04ec0..32eb00f2bb2 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package concealer ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 2ff02e0bb7a..10ef9c86ab4 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 1.10.0 + 1.11.0 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst index d2642971d90..879b0e94dc4 100644 --- a/external/embree_vendor/CHANGELOG.rst +++ b/external/embree_vendor/CHANGELOG.rst @@ -5,6 +5,16 @@ Changelog for package embree_vendor 0.0.9 (2021-07-13) ------------------ +1.11.0 (2024-04-02) +------------------- +* Merge pull request `#1173 `_ from tier4/feature/arm_support + Feature/arm_build_test +* update version +* remove unused files +* remove unused .github directory +* add embree_vendor package to the repository +* Contributors: Masaya Kataoka + 0.1.0 (2021-07-14) ------------------ * Merge branch 'master' of https://github.com/OUXT-Polaris/embree_vendor diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml index 987a14a2bee..3cc900ec11c 100644 --- a/external/embree_vendor/package.xml +++ b/external/embree_vendor/package.xml @@ -2,7 +2,7 @@ embree_vendor - 1.10.0 + 1.11.0 vendor packages for intel raytracing kernel library masaya Apache 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 8444f8099b2..282aaf1c5db 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package kashiwanoha_map ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 1eca16fa1d0..a9777931ae6 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 1.10.0 + 1.11.0 map package for kashiwanoha Masaya Kataoka Apache License 2.0 diff --git a/mock/cpp_mock_scenarios/CHANGELOG.rst b/mock/cpp_mock_scenarios/CHANGELOG.rst index 5c7ffe7e59e..aba5e66a353 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package cpp_mock_scenarios ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index 09eed289b97..bcbc576d3b5 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 1.10.0 + 1.11.0 C++ mock scenarios masaya Apache License 2.0 diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst index 28f90c63f07..e4d3bb31a5e 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package openscenario_experimental_catalog ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index f6c53b49177..7a5135de61c 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 1.10.0 + 1.11.0 TIER IV experimental catalogs for OpenSCENARIO Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter/CHANGELOG.rst b/openscenario/openscenario_interpreter/CHANGELOG.rst index 0d770ce9c3e..a4e08cd89ae 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package openscenario_interpreter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 4c5b2de0f34..2930b3a40c2 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 1.10.0 + 1.11.0 OpenSCENARIO 1.2.0 interpreter package for Autoware Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_example/CHANGELOG.rst b/openscenario/openscenario_interpreter_example/CHANGELOG.rst index ed5c9842713..19df49dbc55 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package openscenario_interpreter_example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index cb822110862..4bca28dd47f 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 1.10.0 + 1.11.0 Examples for some TIER IV OpenSCENARIO Interpreter's features Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst index 8fb12e424f1..85870896e9c 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package openscenario_interpreter_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 27d11358abc..16f9f9697b8 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 1.10.0 + 1.11.0 ROS message types for package openscenario_interpreter Yamasaki Tatsuya Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor/CHANGELOG.rst b/openscenario/openscenario_preprocessor/CHANGELOG.rst index 1256f3e2cfb..631b556d858 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package openscenario_preprocessor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index b88da2a539a..dc1f3e39f9b 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 1.10.0 + 1.11.0 Example package for TIER IV OpenSCENARIO Interpreter Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst index b185416be79..8149e7a3e9b 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package openscenario_preprocessor_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index fa3f6e2e5c9..30f48ae4097 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 1.10.0 + 1.11.0 ROS message types for package openscenario_preprocessor Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_utility/CHANGELOG.rst b/openscenario/openscenario_utility/CHANGELOG.rst index 4ca515c5098..e8fd2b4fe88 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package openscenario_utility ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 2e95cfa1881..0d23bc0ec91 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 1.10.0 + 1.11.0 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/rviz_plugins/openscenario_visualization/CHANGELOG.rst b/rviz_plugins/openscenario_visualization/CHANGELOG.rst index a2bb551d0d2..d09a394eed9 100644 --- a/rviz_plugins/openscenario_visualization/CHANGELOG.rst +++ b/rviz_plugins/openscenario_visualization/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package openscenario_visualization ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge pull request `#1173 `_ from tier4/feature/arm_support + Feature/arm_build_test +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/rviz_plugins/openscenario_visualization/package.xml b/rviz_plugins/openscenario_visualization/package.xml index 1a987ad7ad0..b4d3d87dd97 100644 --- a/rviz_plugins/openscenario_visualization/package.xml +++ b/rviz_plugins/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 1.10.0 + 1.11.0 Visualization tools for simulation results Masaya Kataoka Kyoichi Sugahara diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst index 9f5bc071df4..bd6e3f2b0d3 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package real_time_factor_control_rviz_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml index 90bf9ccfefd..7f788bed5e4 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml @@ -2,7 +2,7 @@ real_time_factor_control_rviz_plugin - 1.10.0 + 1.11.0 Slider controlling real time factor value. Paweł Lech Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 23c31d9857a..f1681bcfa78 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 30e11412263..7bf002ae0f1 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 1.10.0 + 1.11.0 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 diff --git a/simulation/behavior_tree_plugin/CHANGELOG.rst b/simulation/behavior_tree_plugin/CHANGELOG.rst index 1bcc756a436..c0cf15a2585 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package behavior_tree_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 45cf999daad..54c4bde4659 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 1.10.0 + 1.11.0 Behavior tree plugin for traffic_simulator masaya Apache 2.0 diff --git a/simulation/do_nothing_plugin/CHANGELOG.rst b/simulation/do_nothing_plugin/CHANGELOG.rst index 5fd3932729d..44f9dd92cac 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package do_nothing_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 7dfa2c7848a..77c299b21aa 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 1.10.0 + 1.11.0 Behavior plugin for do nothing Masaya Kataoka Apache 2.0 diff --git a/simulation/simple_sensor_simulator/CHANGELOG.rst b/simulation/simple_sensor_simulator/CHANGELOG.rst index 8eb43091914..e97ef3a616d 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -2,6 +2,25 @@ Changelog for package simple_sensor_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge pull request `#1173 `_ from tier4/feature/arm_support + Feature/arm_build_test +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* fix compile error +* remove IntersectContext +* remove unused function +* remove unused line +* rename to new struct name + https://github.com/embree/embree/blob/be0accfd0b246e2b03355b8ee7710a22c1b49240/README.md?plain=1#L1360-L1361 +* remove some warnings +* change header +* add arm support branch +* Contributors: Masaya Kataoka, Ubuntu, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge pull request `#1200 `_ from tier4/feature/simple_sensor_simulator/custom_noise diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 8b5ec56a387..3096dd6bc3e 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 1.10.0 + 1.11.0 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index d226cab0a0a..91f0df41b0e 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package simulation_interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index baf7cd5ba4e..cc6ec38d3e5 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 1.10.0 + 1.11.0 packages to define interface between simulator and scenario interpreter Masaya Kataoka Apache License 2.0 diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index ec4a207d939..c6bbc5cd8dc 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -2,6 +2,16 @@ Changelog for package traffic_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index d61440b0818..a49053bfa01 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 1.10.0 + 1.11.0 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 42fb4e8dc3d..04bfbc46cef 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -2,6 +2,14 @@ Changelog for package openscenario_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index b0d1643fa4d..b5115b17672 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 1.10.0 + 1.11.0 ROS messages for openscenario Masaya Kataoka Apache License 2.0 diff --git a/test_runner/random_test_runner/CHANGELOG.rst b/test_runner/random_test_runner/CHANGELOG.rst index 09d90277f4a..8a7e4c3d39b 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -2,6 +2,15 @@ Changelog for package random_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* Contributors: Masaya Kataoka, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index fb6dd901648..f4aad683fc9 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 1.10.0 + 1.11.0 Random behavior test runner piotr-zyskowski-rai Apache License 2.0 diff --git a/test_runner/scenario_test_runner/CHANGELOG.rst b/test_runner/scenario_test_runner/CHANGELOG.rst index f2ef14d0802..ef4effd4bc7 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -2,6 +2,19 @@ Changelog for package scenario_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.0 (2024-04-02) +------------------- +* Merge pull request `#1173 `_ from tier4/feature/arm_support + Feature/arm_build_test +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin/master' into feature/arm_support +* Merge remote-tracking branch 'upstream/master' into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support +* Merge remote-tracking branch 'origin' into feature/arm_support +* add scenario +* Contributors: Masaya Kataoka, Ubuntu, f0reachARR + 1.10.0 (2024-03-28) ------------------- * Merge branch 'master' into feature/simple_sensor_simulator/custom_noise diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index a518bb0c36a..34048cb60e8 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 1.10.0 + 1.11.0 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From 3fe7f045031f060fe7d52f52191c47bf25ee4666 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 5 Apr 2024 10:56:45 +0900 Subject: [PATCH 72/85] remove // headers in STL comment Signed-off-by: Masaya Kataoka --- docs/developer_guide/TrafficSimulator.md | 3 --- .../include/cpp_mock_scenarios/cpp_scenario_node.hpp | 8 +++----- .../src/behavior_plugin/load_do_nothing_plugin.cpp | 6 ++---- .../src/collision/crashing_npc.cpp | 6 ++---- .../src/collision/spawn_with_offset.cpp | 6 ++---- .../src/crosswalk/stop_at_crosswalk.cpp | 6 ++---- .../follow_front_entity/accelerate_and_follow.cpp | 6 ++---- .../follow_front_entity/decelerate_and_follow.cpp | 6 ++---- .../follow_lane/acquire_position_in_world_frame.cpp | 6 ++---- .../src/follow_lane/assign_route_in_world_frame.cpp | 6 ++---- .../src/follow_lane/cancel_request.cpp | 6 ++---- .../src/follow_lane/follow_with_offset.cpp | 6 ++---- .../src/lane_change/lanechange_left.cpp | 6 ++---- .../src/lane_change/lanechange_left_with_id.cpp | 6 ++---- .../src/lane_change/lanechange_linear.cpp | 6 ++---- .../lanechange_linear_lateral_velocity.cpp | 6 ++---- .../src/lane_change/lanechange_linear_time.cpp | 6 ++---- .../lane_change/lanechange_longitudinal_distance.cpp | 6 ++---- .../src/lane_change/lanechange_right.cpp | 6 ++---- .../src/lane_change/lanechange_right_with_id.cpp | 6 ++---- .../src/lane_change/lanechange_time.cpp | 6 ++---- .../get_distance_in_lane_coordinate_distance.cpp | 6 ++---- .../src/measurement/get_distance_to_lane_bound.cpp | 6 ++---- mock/cpp_mock_scenarios/src/merge/merge_left.cpp | 6 ++---- .../src/metrics/traveled_distance.cpp | 12 +++++------- .../src/move_backward/move_backward.cpp | 6 ++---- .../src/pedestrian/walk_straight.cpp | 6 ++---- .../src/random_scenario/random001.cpp | 8 +++----- .../src/speed_planning/request_speed_change.cpp | 6 ++---- .../request_speed_change_continuous_false.cpp | 6 ++---- .../speed_planning/request_speed_change_relative.cpp | 6 ++---- .../src/speed_planning/request_speed_change_step.cpp | 6 ++---- .../request_speed_change_with_limit.cpp | 6 ++---- .../request_speed_change_with_time_constraint.cpp | 6 ++---- ...uest_speed_change_with_time_constraint_linear.cpp | 6 ++---- ...st_speed_change_with_time_constraint_relative.cpp | 6 ++---- .../src/traffic_simulation_demo.cpp | 6 ++---- 37 files changed, 77 insertions(+), 152 deletions(-) diff --git a/docs/developer_guide/TrafficSimulator.md b/docs/developer_guide/TrafficSimulator.md index a2063379add..67d8839a7a1 100644 --- a/docs/developer_guide/TrafficSimulator.md +++ b/docs/developer_guide/TrafficSimulator.md @@ -26,10 +26,7 @@ You can also see the detailed documentation of the API classes [here](https://ti #include #include #include - #include - -// headers in STL #include #include #include diff --git a/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp b/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp index cee1618f281..5989f077922 100644 --- a/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp +++ b/mock/cpp_mock_scenarios/include/cpp_mock_scenarios/cpp_scenario_node.hpp @@ -15,14 +15,12 @@ #ifndef CPP_MOCK_SCENARIOS__CPP_SCENARIO_NODE_HPP_ #define CPP_MOCK_SCENARIOS__CPP_SCENARIO_NODE_HPP_ -#include -#include -#include - -// headers in STL #include #include +#include +#include #include +#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp b/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp index d511b065fe7..124f53f1597 100644 --- a/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp +++ b/mock/cpp_mock_scenarios/src/behavior_plugin/load_do_nothing_plugin.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp b/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp index f85738e8817..a7cb7b95605 100644 --- a/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp +++ b/mock/cpp_mock_scenarios/src/collision/crashing_npc.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp b/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp index 7210d5c8bdc..04fa1eceac6 100644 --- a/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp +++ b/mock/cpp_mock_scenarios/src/collision/spawn_with_offset.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp b/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp index 3e433423821..cd19c42a469 100644 --- a/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp +++ b/mock/cpp_mock_scenarios/src/crosswalk/stop_at_crosswalk.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp b/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp index d71729b2a30..d89f8584c03 100644 --- a/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp +++ b/mock/cpp_mock_scenarios/src/follow_front_entity/accelerate_and_follow.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp b/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp index 24108503cb6..6079e54af5e 100644 --- a/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp +++ b/mock/cpp_mock_scenarios/src/follow_front_entity/decelerate_and_follow.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp b/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp index e2c477b79e3..9ca26be1585 100644 --- a/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp +++ b/mock/cpp_mock_scenarios/src/follow_lane/acquire_position_in_world_frame.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp b/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp index 3631456c15a..ea6d6cbf02d 100644 --- a/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp +++ b/mock/cpp_mock_scenarios/src/follow_lane/assign_route_in_world_frame.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp b/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp index d21a4889826..acb92544a19 100644 --- a/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp +++ b/mock/cpp_mock_scenarios/src/follow_lane/cancel_request.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp b/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp index 38bba72a680..dc2d0df7616 100644 --- a/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp +++ b/mock/cpp_mock_scenarios/src/follow_lane/follow_with_offset.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp index e7ad9daa2a0..0da53d6be17 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp index b49470be49a..f44fd8cf1db 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_left_with_id.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp index a22427f0691..96e4f951e36 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp index 5f81424dced..5fb7bf04e9c 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_lateral_velocity.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp index a0581369b18..ce85da9136b 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_linear_time.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp index c822a005b25..18b71d0914a 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_longitudinal_distance.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp index 491f557bd4b..99a832208b4 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp index 9ebd20c6b51..aca94784ae8 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_right_with_id.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp b/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp index 3d815d19113..d51f0629965 100644 --- a/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp +++ b/mock/cpp_mock_scenarios/src/lane_change/lanechange_time.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp b/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp index 4d51b8dd65c..373ba5d72de 100644 --- a/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp +++ b/mock/cpp_mock_scenarios/src/measurement/get_distance_in_lane_coordinate_distance.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp b/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp index 0ffc13ec20b..b059a66602b 100644 --- a/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp +++ b/mock/cpp_mock_scenarios/src/measurement/get_distance_to_lane_bound.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/merge/merge_left.cpp b/mock/cpp_mock_scenarios/src/merge/merge_left.cpp index 1dd1ab4738a..58657664c30 100644 --- a/mock/cpp_mock_scenarios/src/merge/merge_left.cpp +++ b/mock/cpp_mock_scenarios/src/merge/merge_left.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp b/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp index ee1f035b666..a9fb6e778d1 100644 --- a/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp +++ b/mock/cpp_mock_scenarios/src/metrics/traveled_distance.cpp @@ -15,22 +15,20 @@ #include #include +#include #include #include +#include +#include #include +#include #include #include +#include #include "rclcpp/logger.hpp" #include "rclcpp/logging.hpp" -// headers in STL -#include -#include -#include -#include -#include - namespace cpp_mock_scenarios { class TraveledDistanceScenario : public cpp_mock_scenarios::CppScenarioNode diff --git a/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp b/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp index 33638138c07..86472368741 100644 --- a/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp +++ b/mock/cpp_mock_scenarios/src/move_backward/move_backward.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp b/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp index 54478ddc5ab..c43a293acaa 100644 --- a/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp +++ b/mock/cpp_mock_scenarios/src/pedestrian/walk_straight.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp b/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp index 07c451dcb0c..18ba59f2115 100644 --- a/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp +++ b/mock/cpp_mock_scenarios/src/random_scenario/random001.cpp @@ -17,15 +17,13 @@ #include #include #include +#include #include +#include #include +#include #include #include - -// headers in STL -#include -#include -#include #include class RandomScenario : public cpp_mock_scenarios::CppScenarioNode diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp index 94844fabf3f..79b7c5dfb05 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp index 7a83e377531..b49c3b12311 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_continuous_false.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp index c1c14e5e77d..87721639833 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_relative.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp index 7e6d66932bc..2cdec5c0d60 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_step.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp index 675181e00c4..5e9e161d001 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_limit.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp index f486fcec618..3552d6dbb75 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp index 144857533df..b6999ecd263 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_linear.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp index 9336be41024..be3fa4e59d9 100644 --- a/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp +++ b/mock/cpp_mock_scenarios/src/speed_planning/request_speed_change_with_time_constraint_relative.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios diff --git a/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp b/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp index a3c311ad6a6..d323f921542 100644 --- a/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp +++ b/mock/cpp_mock_scenarios/src/traffic_simulation_demo.cpp @@ -17,13 +17,11 @@ #include #include #include +#include #include +#include #include #include - -// headers in STL -#include -#include #include namespace cpp_mock_scenarios From 5d1a387408438bfb7d12e8d20c7520594a0cccec Mon Sep 17 00:00:00 2001 From: Release Bot Date: Fri, 5 Apr 2024 04:33:35 +0000 Subject: [PATCH 73/85] Bump version of scenario_simulator_v2 from version 1.11.0 to version 1.11.1 --- common/math/arithmetic/CHANGELOG.rst | 3 +++ common/math/arithmetic/package.xml | 2 +- common/math/geometry/CHANGELOG.rst | 3 +++ common/math/geometry/package.xml | 2 +- common/scenario_simulator_exception/CHANGELOG.rst | 3 +++ common/scenario_simulator_exception/package.xml | 2 +- common/simple_junit/CHANGELOG.rst | 3 +++ common/simple_junit/package.xml | 2 +- common/status_monitor/CHANGELOG.rst | 3 +++ common/status_monitor/package.xml | 2 +- external/concealer/CHANGELOG.rst | 3 +++ external/concealer/package.xml | 2 +- external/embree_vendor/CHANGELOG.rst | 3 +++ external/embree_vendor/package.xml | 2 +- map/kashiwanoha_map/CHANGELOG.rst | 3 +++ map/kashiwanoha_map/package.xml | 2 +- mock/cpp_mock_scenarios/CHANGELOG.rst | 7 +++++++ mock/cpp_mock_scenarios/package.xml | 2 +- .../openscenario_experimental_catalog/CHANGELOG.rst | 3 +++ openscenario/openscenario_experimental_catalog/package.xml | 2 +- openscenario/openscenario_interpreter/CHANGELOG.rst | 3 +++ openscenario/openscenario_interpreter/package.xml | 2 +- .../openscenario_interpreter_example/CHANGELOG.rst | 3 +++ openscenario/openscenario_interpreter_example/package.xml | 2 +- openscenario/openscenario_interpreter_msgs/CHANGELOG.rst | 3 +++ openscenario/openscenario_interpreter_msgs/package.xml | 2 +- openscenario/openscenario_preprocessor/CHANGELOG.rst | 3 +++ openscenario/openscenario_preprocessor/package.xml | 2 +- openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst | 3 +++ openscenario/openscenario_preprocessor_msgs/package.xml | 2 +- openscenario/openscenario_utility/CHANGELOG.rst | 3 +++ openscenario/openscenario_utility/package.xml | 2 +- rviz_plugins/openscenario_visualization/CHANGELOG.rst | 3 +++ rviz_plugins/openscenario_visualization/package.xml | 2 +- .../real_time_factor_control_rviz_plugin/CHANGELOG.rst | 3 +++ .../real_time_factor_control_rviz_plugin/package.xml | 2 +- scenario_simulator_v2/CHANGELOG.rst | 3 +++ scenario_simulator_v2/package.xml | 2 +- simulation/behavior_tree_plugin/CHANGELOG.rst | 3 +++ simulation/behavior_tree_plugin/package.xml | 2 +- simulation/do_nothing_plugin/CHANGELOG.rst | 3 +++ simulation/do_nothing_plugin/package.xml | 2 +- simulation/simple_sensor_simulator/CHANGELOG.rst | 3 +++ simulation/simple_sensor_simulator/package.xml | 2 +- simulation/simulation_interface/CHANGELOG.rst | 3 +++ simulation/simulation_interface/package.xml | 2 +- simulation/traffic_simulator/CHANGELOG.rst | 3 +++ simulation/traffic_simulator/package.xml | 2 +- simulation/traffic_simulator_msgs/CHANGELOG.rst | 3 +++ simulation/traffic_simulator_msgs/package.xml | 2 +- test_runner/random_test_runner/CHANGELOG.rst | 3 +++ test_runner/random_test_runner/package.xml | 2 +- test_runner/scenario_test_runner/CHANGELOG.rst | 3 +++ test_runner/scenario_test_runner/package.xml | 2 +- 54 files changed, 112 insertions(+), 27 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 35a55c949b7..79f5c95791b 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package arithmetic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index 316fe13c81d..f9cd2caddf2 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 1.11.0 + 1.11.1 arithmetic library for scenario_simulator_v2 Tatsuya Yamasaki Apache License 2.0 diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst index de2e823c9a9..6e69f0fc4b0 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package geometry ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index f42380a365e..2b4bf4f171e 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 1.11.0 + 1.11.1 geometry math library for scenario_simulator_v2 application Masaya Kataoka Apache License 2.0 diff --git a/common/scenario_simulator_exception/CHANGELOG.rst b/common/scenario_simulator_exception/CHANGELOG.rst index 075b92c9197..5080497050b 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package scenario_simulator_exception ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 94ca86eacdf..409845dfb12 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 1.11.0 + 1.11.1 Exception types for scenario simulator Tatsuya Yamasaki Apache License 2.0 diff --git a/common/simple_junit/CHANGELOG.rst b/common/simple_junit/CHANGELOG.rst index 8c793ffaafc..b461cabb71c 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package junit_exporter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 5a6a6294cef..637d4a364f5 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 1.11.0 + 1.11.1 Lightweight JUnit library for ROS 2 Masaya Kataoka Tatsuya Yamasaki diff --git a/common/status_monitor/CHANGELOG.rst b/common/status_monitor/CHANGELOG.rst index 0db7c594b6c..db5d46a4aff 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package status_monitor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 9932a001497..0587a9101f8 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 1.11.0 + 1.11.1 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index 32eb00f2bb2..bb170cf731e 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package concealer ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 10ef9c86ab4..9e911091986 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 1.11.0 + 1.11.1 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst index 879b0e94dc4..d9188fabfa7 100644 --- a/external/embree_vendor/CHANGELOG.rst +++ b/external/embree_vendor/CHANGELOG.rst @@ -5,6 +5,9 @@ Changelog for package embree_vendor 0.0.9 (2021-07-13) ------------------ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge pull request `#1173 `_ from tier4/feature/arm_support diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml index 3cc900ec11c..2f5d0717aa6 100644 --- a/external/embree_vendor/package.xml +++ b/external/embree_vendor/package.xml @@ -2,7 +2,7 @@ embree_vendor - 1.11.0 + 1.11.1 vendor packages for intel raytracing kernel library masaya Apache 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 282aaf1c5db..49c41fbbc06 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package kashiwanoha_map ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index a9777931ae6..71c96a13124 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 1.11.0 + 1.11.1 map package for kashiwanoha Masaya Kataoka Apache License 2.0 diff --git a/mock/cpp_mock_scenarios/CHANGELOG.rst b/mock/cpp_mock_scenarios/CHANGELOG.rst index aba5e66a353..340d7b17e4b 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package cpp_mock_scenarios ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- +* Merge pull request `#1224 `_ from tier4/fix/remove_headers_in_stl_comment + remove // headers in STL comment +* remove // headers in STL comment +* Contributors: Masaya Kataoka, Tatsuya Yamasaki + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index bcbc576d3b5..711e44563f3 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 1.11.0 + 1.11.1 C++ mock scenarios masaya Apache License 2.0 diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst index e4d3bb31a5e..ef095e599b5 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_experimental_catalog ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 7a5135de61c..9f46d436088 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 1.11.0 + 1.11.1 TIER IV experimental catalogs for OpenSCENARIO Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter/CHANGELOG.rst b/openscenario/openscenario_interpreter/CHANGELOG.rst index a4e08cd89ae..610c12b405b 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_interpreter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 2930b3a40c2..09d7bb76be1 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 1.11.0 + 1.11.1 OpenSCENARIO 1.2.0 interpreter package for Autoware Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_example/CHANGELOG.rst b/openscenario/openscenario_interpreter_example/CHANGELOG.rst index 19df49dbc55..21a45b33ef2 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_interpreter_example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 4bca28dd47f..456a83cc784 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 1.11.0 + 1.11.1 Examples for some TIER IV OpenSCENARIO Interpreter's features Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst index 85870896e9c..996e1f4503d 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_interpreter_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 16f9f9697b8..004456357ad 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 1.11.0 + 1.11.1 ROS message types for package openscenario_interpreter Yamasaki Tatsuya Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor/CHANGELOG.rst b/openscenario/openscenario_preprocessor/CHANGELOG.rst index 631b556d858..5dc1120c8fa 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_preprocessor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index dc1f3e39f9b..fa44f3bc001 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 1.11.0 + 1.11.1 Example package for TIER IV OpenSCENARIO Interpreter Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst index 8149e7a3e9b..c4cda42d091 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_preprocessor_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 30f48ae4097..0347dfb864c 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 1.11.0 + 1.11.1 ROS message types for package openscenario_preprocessor Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_utility/CHANGELOG.rst b/openscenario/openscenario_utility/CHANGELOG.rst index e8fd2b4fe88..e36ee8320e8 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_utility ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 0d23bc0ec91..9180bd92a7d 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 1.11.0 + 1.11.1 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/rviz_plugins/openscenario_visualization/CHANGELOG.rst b/rviz_plugins/openscenario_visualization/CHANGELOG.rst index d09a394eed9..2dcef42c507 100644 --- a/rviz_plugins/openscenario_visualization/CHANGELOG.rst +++ b/rviz_plugins/openscenario_visualization/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_visualization ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge pull request `#1173 `_ from tier4/feature/arm_support diff --git a/rviz_plugins/openscenario_visualization/package.xml b/rviz_plugins/openscenario_visualization/package.xml index b4d3d87dd97..2237b721234 100644 --- a/rviz_plugins/openscenario_visualization/package.xml +++ b/rviz_plugins/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 1.11.0 + 1.11.1 Visualization tools for simulation results Masaya Kataoka Kyoichi Sugahara diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst index bd6e3f2b0d3..b3f4ff2c071 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package real_time_factor_control_rviz_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml index 7f788bed5e4..43b766c2184 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml @@ -2,7 +2,7 @@ real_time_factor_control_rviz_plugin - 1.11.0 + 1.11.1 Slider controlling real time factor value. Paweł Lech Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index f1681bcfa78..021a072aff9 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 7bf002ae0f1..f6ca9df6be8 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 1.11.0 + 1.11.1 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 diff --git a/simulation/behavior_tree_plugin/CHANGELOG.rst b/simulation/behavior_tree_plugin/CHANGELOG.rst index c0cf15a2585..3b0eb29ae34 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package behavior_tree_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 54c4bde4659..31d130bb22a 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 1.11.0 + 1.11.1 Behavior tree plugin for traffic_simulator masaya Apache 2.0 diff --git a/simulation/do_nothing_plugin/CHANGELOG.rst b/simulation/do_nothing_plugin/CHANGELOG.rst index 44f9dd92cac..f648185d2b8 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package do_nothing_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 77c299b21aa..489822d27d1 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 1.11.0 + 1.11.1 Behavior plugin for do nothing Masaya Kataoka Apache 2.0 diff --git a/simulation/simple_sensor_simulator/CHANGELOG.rst b/simulation/simple_sensor_simulator/CHANGELOG.rst index e97ef3a616d..90f42fc2a04 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package simple_sensor_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge pull request `#1173 `_ from tier4/feature/arm_support diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 3096dd6bc3e..fc755129014 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 1.11.0 + 1.11.1 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 91f0df41b0e..c61c9001ecf 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package simulation_interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index cc6ec38d3e5..37519f598b5 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 1.11.0 + 1.11.1 packages to define interface between simulator and scenario interpreter Masaya Kataoka Apache License 2.0 diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index c6bbc5cd8dc..6be976129d0 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package traffic_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index a49053bfa01..1ca6055b65a 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 1.11.0 + 1.11.1 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 04bfbc46cef..51cbe2b265e 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index b5115b17672..f941442105d 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 1.11.0 + 1.11.1 ROS messages for openscenario Masaya Kataoka Apache License 2.0 diff --git a/test_runner/random_test_runner/CHANGELOG.rst b/test_runner/random_test_runner/CHANGELOG.rst index 8a7e4c3d39b..9f4a6e4b06b 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package random_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/arm_support diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index f4aad683fc9..6befeee6d94 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 1.11.0 + 1.11.1 Random behavior test runner piotr-zyskowski-rai Apache License 2.0 diff --git a/test_runner/scenario_test_runner/CHANGELOG.rst b/test_runner/scenario_test_runner/CHANGELOG.rst index ef4effd4bc7..10475ea49cf 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package scenario_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.1 (2024-04-05) +------------------- + 1.11.0 (2024-04-02) ------------------- * Merge pull request `#1173 `_ from tier4/feature/arm_support diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 34048cb60e8..7e1eeebc945 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 1.11.0 + 1.11.1 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From eefb609f87d6a7b96dc85f9a0e488811674092a7 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 5 Apr 2024 14:00:14 +0900 Subject: [PATCH 74/85] refactor: remove redundant code according to N4659 (6.1) Co-authored-by: Tatsuya Yamasaki --- .../include/openscenario_interpreter/syntax/double.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp index 747d48ccac5..d7332cdfbda 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp @@ -25,7 +25,7 @@ struct Double { using value_type = double; - value_type data = 0.0; + value_type data; Double() = default; From b22c1eb654b8019b2071d5a5bb91f0a5e0e8b8c6 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 5 Apr 2024 14:00:23 +0900 Subject: [PATCH 75/85] refactor: remove redundant code according to N4659 (6.1) Co-authored-by: Tatsuya Yamasaki --- .../include/openscenario_interpreter/syntax/integer.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp index aa50692211d..2e5f32a4fe8 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp @@ -27,7 +27,7 @@ struct Integer { using value_type = std::int64_t; - value_type data = 0; + value_type data; explicit Integer() = default; From 3a25f9cb92189d17658fcda8c02043172191e2aa Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 5 Apr 2024 14:00:31 +0900 Subject: [PATCH 76/85] refactor: remove redundant code according to N4659 (6.1) Co-authored-by: Tatsuya Yamasaki --- .../include/openscenario_interpreter/syntax/unsigned_short.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp index 73b4bc34455..2144ca8cda3 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp @@ -26,7 +26,7 @@ struct UnsignedShort { using value_type = std::uint16_t; - value_type data = 0U; + value_type data; explicit UnsignedShort() = default; From 6b346e513edd1bc3ae3c943543d977e71fa06ce4 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 5 Apr 2024 06:30:58 +0000 Subject: [PATCH 77/85] refactor: stop using explicit keyword to default constructors --- .../include/openscenario_interpreter/scope.hpp | 2 +- .../include/openscenario_interpreter/syntax/boolean.hpp | 2 +- .../openscenario_interpreter/syntax/catalog_locations.hpp | 2 +- .../include/openscenario_interpreter/syntax/command.hpp | 2 +- .../openscenario_interpreter/syntax/condition_edge.hpp | 2 +- .../openscenario_interpreter/syntax/coordinate_system.hpp | 2 +- .../include/openscenario_interpreter/syntax/double.hpp | 2 +- .../openscenario_interpreter/syntax/dynamics_dimension.hpp | 2 +- .../openscenario_interpreter/syntax/dynamics_shape.hpp | 2 +- .../syntax/fractional_cloud_cover.hpp | 2 +- .../include/openscenario_interpreter/syntax/integer.hpp | 2 +- .../openscenario_interpreter/syntax/misc_object_category.hpp | 2 +- .../syntax/override_controller_value_action.hpp | 2 +- .../openscenario_interpreter/syntax/parameter_assignments.hpp | 3 ++- .../openscenario_interpreter/syntax/parameter_declaration.hpp | 2 +- .../openscenario_interpreter/syntax/parameter_type.hpp | 2 +- .../openscenario_interpreter/syntax/precipitation_type.hpp | 2 +- .../include/openscenario_interpreter/syntax/priority.hpp | 2 +- .../syntax/relative_distance_type.hpp | 2 +- .../openscenario_interpreter/syntax/route_strategy.hpp | 2 +- .../include/openscenario_interpreter/syntax/rule.hpp | 2 +- .../syntax/speed_target_value_type.hpp | 2 +- .../syntax/storyboard_element_state.hpp | 2 +- .../syntax/storyboard_element_type.hpp | 2 +- .../syntax/triggering_entities_rule.hpp | 2 +- .../openscenario_interpreter/syntax/unsigned_integer.hpp | 4 +++- .../openscenario_interpreter/syntax/unsigned_short.hpp | 2 +- .../include/openscenario_interpreter/syntax/wetness.hpp | 2 +- 28 files changed, 31 insertions(+), 28 deletions(-) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/scope.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/scope.hpp index 4a2ebd26c49..4f6cfe13ed5 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/scope.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/scope.hpp @@ -57,7 +57,7 @@ class EnvironmentFrame #undef DEFINE_SYNTAX_ERROR - explicit EnvironmentFrame() = default; + EnvironmentFrame() = default; explicit EnvironmentFrame(EnvironmentFrame &, const std::string &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp index 9d0d9874b86..f08ac3151e2 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp @@ -28,7 +28,7 @@ struct Boolean value_type data; - explicit Boolean() = default; + Boolean() = default; explicit constexpr Boolean(value_type value) noexcept : data(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/catalog_locations.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/catalog_locations.hpp index 2a97dee348b..155a4838aa8 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/catalog_locations.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/catalog_locations.hpp @@ -42,7 +42,7 @@ inline namespace syntax struct CatalogLocations : public std::unordered_map { - explicit CatalogLocations() = default; + CatalogLocations() = default; explicit CatalogLocations(const pugi::xml_node &, Scope &); }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/command.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/command.hpp index 5db0bf35707..ccc0638ac54 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/command.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/command.hpp @@ -30,7 +30,7 @@ struct Command print, } value; - explicit Command() = default; + Command() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/condition_edge.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/condition_edge.hpp index 6514ef25399..702d2527f51 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/condition_edge.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/condition_edge.hpp @@ -101,7 +101,7 @@ struct ConditionEdge sticky, } value; - explicit ConditionEdge() = default; + ConditionEdge() = default; operator value_type() const noexcept { return value; } }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/coordinate_system.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/coordinate_system.hpp index ba40742fc71..d36e3fd51d4 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/coordinate_system.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/coordinate_system.hpp @@ -50,7 +50,7 @@ struct CoordinateSystem trajectory, } value; - explicit CoordinateSystem() = default; + CoordinateSystem() = default; constexpr CoordinateSystem(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp index d7332cdfbda..fe9b2c65034 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp @@ -29,7 +29,7 @@ struct Double Double() = default; - Double(value_type); + explicit Double(value_type); explicit Double(const std::string &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_dimension.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_dimension.hpp index 326394f911f..576402efe67 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_dimension.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_dimension.hpp @@ -54,7 +54,7 @@ struct DynamicsDimension distance, } value; - explicit DynamicsDimension() = default; + DynamicsDimension() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_shape.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_shape.hpp index 6e0fc013bcc..444558646e9 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_shape.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/dynamics_shape.hpp @@ -84,7 +84,7 @@ struct DynamicsShape step, } value; - explicit DynamicsShape() = default; + DynamicsShape() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/fractional_cloud_cover.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/fractional_cloud_cover.hpp index f238add5eca..7bcbcf3bc5c 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/fractional_cloud_cover.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/fractional_cloud_cover.hpp @@ -61,7 +61,7 @@ struct FractionalCloudCover nineOktas } value; - explicit FractionalCloudCover() = default; + FractionalCloudCover() = default; constexpr FractionalCloudCover(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp index 2e5f32a4fe8..b1e22b66d7f 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp @@ -29,7 +29,7 @@ struct Integer value_type data; - explicit Integer() = default; + Integer() = default; explicit Integer(value_type); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/misc_object_category.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/misc_object_category.hpp index d402ce6c7f9..35df8c0f39e 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/misc_object_category.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/misc_object_category.hpp @@ -83,7 +83,7 @@ struct MiscObjectCategory wind, // NOTE: DEPRECATED (since OpenSCENARIO 1.1) } value; - explicit MiscObjectCategory() = default; + MiscObjectCategory() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/override_controller_value_action.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/override_controller_value_action.hpp index 5b7bac04856..3da3cf3930c 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/override_controller_value_action.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/override_controller_value_action.hpp @@ -58,7 +58,7 @@ struct OverrideControllerValueAction // New value for gear position or unset value. // const OverrideGearAction overrideGear; - explicit OverrideControllerValueAction() = default; + OverrideControllerValueAction() = default; explicit OverrideControllerValueAction(const pugi::xml_node &, Scope &); }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp index bc5e6dbfdc8..bcc73a0222e 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp @@ -34,7 +34,8 @@ inline namespace syntax * -------------------------------------------------------------------------- */ struct ParameterAssignments : std::list { - explicit ParameterAssignments() = default; + ParameterAssignments() = default; + explicit ParameterAssignments(const pugi::xml_node & node, Scope & scope) : std::list( readElements("ParameterAssignment", node, scope)) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_declaration.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_declaration.hpp index 8b1d1d6addb..8d8e55f708b 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_declaration.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_declaration.hpp @@ -44,7 +44,7 @@ struct ParameterDeclaration const String value; - explicit ParameterDeclaration() = default; + ParameterDeclaration() = default; explicit ParameterDeclaration(const pugi::xml_node &, Scope &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_type.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_type.hpp index c995fe40c63..61692f2ba6b 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_type.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_type.hpp @@ -62,7 +62,7 @@ struct ParameterType UNSIGNED_SHORT, } value; - explicit ParameterType() = default; + ParameterType() = default; constexpr operator value_type() const noexcept { return value; } }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/precipitation_type.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/precipitation_type.hpp index 52124740284..d56aff38176 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/precipitation_type.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/precipitation_type.hpp @@ -43,7 +43,7 @@ struct PrecipitationType { enum value_type { dry, rain, snow } value; - explicit PrecipitationType() = default; + PrecipitationType() = default; constexpr PrecipitationType(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/priority.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/priority.hpp index c767a029420..c3fa6578e7f 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/priority.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/priority.hpp @@ -62,7 +62,7 @@ struct Priority parallel, } value; - explicit Priority() = default; + Priority() = default; constexpr operator value_type() const noexcept { return value; } }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/relative_distance_type.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/relative_distance_type.hpp index 0d7c371aed3..1f8e11fd8a9 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/relative_distance_type.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/relative_distance_type.hpp @@ -59,7 +59,7 @@ struct RelativeDistanceType euclidianDistance, } value; - explicit RelativeDistanceType() = default; + RelativeDistanceType() = default; constexpr RelativeDistanceType(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/route_strategy.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/route_strategy.hpp index aa0deba931e..be6c1ba467d 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/route_strategy.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/route_strategy.hpp @@ -49,7 +49,7 @@ struct RouteStrategy random, // Random route. } value; - explicit RouteStrategy() = default; + RouteStrategy() = default; constexpr operator value_type() const noexcept { return value; } }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/rule.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/rule.hpp index dfd97ba602e..6f87833fc87 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/rule.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/rule.hpp @@ -56,7 +56,7 @@ struct Rule notEqualTo, } value; - explicit Rule() = default; + Rule() = default; explicit Rule(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_target_value_type.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_target_value_type.hpp index 0d3eb829857..69d0008099a 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_target_value_type.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/speed_target_value_type.hpp @@ -58,7 +58,7 @@ struct SpeedTargetValueType factor, } value; - explicit SpeedTargetValueType() = default; + SpeedTargetValueType() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_state.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_state.hpp index 8d84cf37aee..34ed0960a65 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_state.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_state.hpp @@ -173,7 +173,7 @@ struct StoryboardElementState skipTransition, } value; - explicit StoryboardElementState() = default; + StoryboardElementState() = default; explicit StoryboardElementState(value_type value) : value(value) {} diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_type.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_type.hpp index 19d07780954..7d7ad1f65ae 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_type.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/storyboard_element_type.hpp @@ -53,7 +53,7 @@ struct StoryboardElementType story, } value; - explicit StoryboardElementType() = default; + StoryboardElementType() = default; constexpr operator value_type() const noexcept { return value; } }; diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/triggering_entities_rule.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/triggering_entities_rule.hpp index d7c9bcea9f8..0bab155fa87 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/triggering_entities_rule.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/triggering_entities_rule.hpp @@ -48,7 +48,7 @@ struct TriggeringEntitiesRule none, } value; - explicit TriggeringEntitiesRule() = default; + TriggeringEntitiesRule() = default; constexpr operator value_type() const noexcept { return value; } diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp index e0a73d29f09..6868e254529 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp @@ -29,7 +29,9 @@ struct UnsignedInteger value_type data; - explicit UnsignedInteger(value_type value = {}); + UnsignedInteger() = default; + + explicit UnsignedInteger(value_type); explicit UnsignedInteger(const std::string &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp index 2144ca8cda3..958076e50a1 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_short.hpp @@ -28,7 +28,7 @@ struct UnsignedShort value_type data; - explicit UnsignedShort() = default; + UnsignedShort() = default; explicit UnsignedShort(value_type); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/wetness.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/wetness.hpp index 216c16fb2bc..a2193c705a5 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/wetness.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/wetness.hpp @@ -51,7 +51,7 @@ struct Wetness highFlooded // Road completely covered with water. Water depth > 5cm. } value; - explicit Wetness() = default; + Wetness() = default; constexpr Wetness(value_type value) : value(value) {} From 09ec7a25f4b5da66fbb0c464ff86fac77edcb5ec Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 5 Apr 2024 19:17:10 +0900 Subject: [PATCH 78/85] refactor: stop using explicit keyword to default constructors --- .../include/openscenario_interpreter/syntax/boolean.hpp | 2 +- .../include/openscenario_interpreter/syntax/double.hpp | 2 +- .../include/openscenario_interpreter/syntax/integer.hpp | 2 +- .../openscenario_interpreter/syntax/unsigned_integer.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp index f08ac3151e2..a7250388353 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/boolean.hpp @@ -30,7 +30,7 @@ struct Boolean Boolean() = default; - explicit constexpr Boolean(value_type value) noexcept : data(value) {} + constexpr Boolean(value_type value) noexcept : data(value) {} explicit Boolean(const std::string &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp index fe9b2c65034..d7332cdfbda 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/double.hpp @@ -29,7 +29,7 @@ struct Double Double() = default; - explicit Double(value_type); + Double(value_type); explicit Double(const std::string &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp index b1e22b66d7f..b074cf26ae6 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/integer.hpp @@ -31,7 +31,7 @@ struct Integer Integer() = default; - explicit Integer(value_type); + Integer(value_type); explicit Integer(const std::string &); diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp index 6868e254529..8e052473a5f 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/unsigned_integer.hpp @@ -31,7 +31,7 @@ struct UnsignedInteger UnsignedInteger() = default; - explicit UnsignedInteger(value_type); + UnsignedInteger(value_type); explicit UnsignedInteger(const std::string &); From 014f38993c92a2849913ea789d55b1fa6eb694f7 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 5 Apr 2024 19:17:57 +0900 Subject: [PATCH 79/85] refactor: stop marking as const to members of Orientation --- .../include/openscenario_interpreter/syntax/orientation.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/orientation.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/orientation.hpp index 2690cf3309a..8c92271a4c6 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/orientation.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/orientation.hpp @@ -39,7 +39,7 @@ struct Orientation { const ReferenceContext type{}; - const Double h, p, r; + Double h, p, r; Orientation() = default; From a9173b1ea434825f0266be2dc702bdd113dd23f1 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 5 Apr 2024 19:19:00 +0900 Subject: [PATCH 80/85] chore: fixed tests for structures that became trivial --- openscenario/openscenario_interpreter/src/syntax/double.cpp | 4 ++-- openscenario/openscenario_interpreter/src/syntax/integer.cpp | 2 +- .../openscenario_interpreter/src/syntax/unsigned_integer.cpp | 2 +- .../openscenario_interpreter/src/syntax/unsigned_short.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/openscenario/openscenario_interpreter/src/syntax/double.cpp b/openscenario/openscenario_interpreter/src/syntax/double.cpp index 101bb74d7ee..84b28e35fd9 100644 --- a/openscenario/openscenario_interpreter/src/syntax/double.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/double.cpp @@ -25,9 +25,9 @@ inline namespace syntax { static_assert(std::is_standard_layout::value, ""); -static_assert(not std::is_trivial::value, ""); +static_assert(std::is_trivial::value, ""); -Double::Double(value_type value) { data = value; } +Double::Double(value_type value) : data(value) {} Double::Double(const std::string & s) try { diff --git a/openscenario/openscenario_interpreter/src/syntax/integer.cpp b/openscenario/openscenario_interpreter/src/syntax/integer.cpp index c5fe10c4df8..2c7f55c03ea 100644 --- a/openscenario/openscenario_interpreter/src/syntax/integer.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/integer.cpp @@ -21,7 +21,7 @@ inline namespace syntax { static_assert(std::is_standard_layout::value, ""); -static_assert(not std::is_trivial::value, ""); +static_assert(std::is_trivial::value, ""); Integer::Integer(value_type value) { data = value; } diff --git a/openscenario/openscenario_interpreter/src/syntax/unsigned_integer.cpp b/openscenario/openscenario_interpreter/src/syntax/unsigned_integer.cpp index a08d6ce8921..4a2094c8cf8 100644 --- a/openscenario/openscenario_interpreter/src/syntax/unsigned_integer.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/unsigned_integer.cpp @@ -20,7 +20,7 @@ inline namespace syntax { static_assert(std::is_standard_layout::value, ""); -static_assert(not std::is_trivial::value, ""); +static_assert(std::is_trivial::value, ""); UnsignedInteger::UnsignedInteger(value_type value) { data = value; } diff --git a/openscenario/openscenario_interpreter/src/syntax/unsigned_short.cpp b/openscenario/openscenario_interpreter/src/syntax/unsigned_short.cpp index e5f09a0c064..bfc23d9f58c 100644 --- a/openscenario/openscenario_interpreter/src/syntax/unsigned_short.cpp +++ b/openscenario/openscenario_interpreter/src/syntax/unsigned_short.cpp @@ -22,7 +22,7 @@ inline namespace syntax { static_assert(std::is_standard_layout::value, ""); -static_assert(not std::is_trivial::value, ""); +static_assert(std::is_trivial::value, ""); UnsignedShort::UnsignedShort(value_type value) { data = value; } From aa1a463ddb81858b7a4ea5301397aafc2ec943c8 Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 5 Apr 2024 19:20:15 +0900 Subject: [PATCH 81/85] chore: make another version of Properties::get to suite new form of basic types of openscenario_interpreter/syntax --- .../openscenario_interpreter/syntax/properties.hpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/properties.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/properties.hpp index e4e94a551ef..f9421ec345b 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/properties.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/properties.hpp @@ -61,7 +61,7 @@ struct Properties explicit Properties(const pugi::xml_node &, Scope &); template - auto get(const String & name, const T & default_value = T()) const -> auto + auto get(const String & name, const T & default_value) const -> auto { if (auto iter = properties.find(name); iter != std::end(properties)) { if (const auto [name, property] = *iter; not property.value.empty()) { @@ -73,6 +73,12 @@ struct Properties return default_value; } } + + template + auto get(const String & name) const -> auto + { + return get(name, T()); + } }; } // namespace syntax } // namespace openscenario_interpreter From 4e6d9a3094e2402c3c02c1c29b626c6377666cef Mon Sep 17 00:00:00 2001 From: Kotaro Yoshimoto Date: Fri, 5 Apr 2024 23:00:46 +0900 Subject: [PATCH 82/85] chore: apply linter --- .../openscenario_interpreter/syntax/parameter_assignments.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp index bcc73a0222e..c90b054104d 100644 --- a/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp +++ b/openscenario/openscenario_interpreter/include/openscenario_interpreter/syntax/parameter_assignments.hpp @@ -35,7 +35,7 @@ inline namespace syntax struct ParameterAssignments : std::list { ParameterAssignments() = default; - + explicit ParameterAssignments(const pugi::xml_node & node, Scope & scope) : std::list( readElements("ParameterAssignment", node, scope)) From 580895d5991d04e02bb7bd96e85ce944391b54ff Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 8 Apr 2024 15:34:11 +0900 Subject: [PATCH 83/85] fix -Wreorder warnings in test extcutor class Signed-off-by: Masaya Kataoka --- .../include/random_test_runner/test_executor.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_runner/random_test_runner/include/random_test_runner/test_executor.hpp b/test_runner/random_test_runner/include/random_test_runner/test_executor.hpp index 43c5d645515..57a3caf44ff 100644 --- a/test_runner/random_test_runner/include/random_test_runner/test_executor.hpp +++ b/test_runner/random_test_runner/include/random_test_runner/test_executor.hpp @@ -243,8 +243,8 @@ class TestExecutor EgoCollisionMetric ego_collision_metric_; JunitXmlReporterTestCase error_reporter_; - ArchitectureType architecture_type_; double test_timeout_; + ArchitectureType architecture_type_; bool scenario_completed_ = false; From c1f1f15694e1496e766483d8c8afa90d79de5ebf Mon Sep 17 00:00:00 2001 From: Release Bot Date: Mon, 8 Apr 2024 09:43:57 +0000 Subject: [PATCH 84/85] Bump version of scenario_simulator_v2 from version 1.11.1 to version 1.11.2 --- common/math/arithmetic/CHANGELOG.rst | 3 +++ common/math/arithmetic/package.xml | 2 +- common/math/geometry/CHANGELOG.rst | 3 +++ common/math/geometry/package.xml | 2 +- common/scenario_simulator_exception/CHANGELOG.rst | 3 +++ common/scenario_simulator_exception/package.xml | 2 +- common/simple_junit/CHANGELOG.rst | 3 +++ common/simple_junit/package.xml | 2 +- common/status_monitor/CHANGELOG.rst | 3 +++ common/status_monitor/package.xml | 2 +- external/concealer/CHANGELOG.rst | 3 +++ external/concealer/package.xml | 2 +- external/embree_vendor/CHANGELOG.rst | 3 +++ external/embree_vendor/package.xml | 2 +- map/kashiwanoha_map/CHANGELOG.rst | 3 +++ map/kashiwanoha_map/package.xml | 2 +- mock/cpp_mock_scenarios/CHANGELOG.rst | 3 +++ mock/cpp_mock_scenarios/package.xml | 2 +- .../openscenario_experimental_catalog/CHANGELOG.rst | 3 +++ openscenario/openscenario_experimental_catalog/package.xml | 2 +- openscenario/openscenario_interpreter/CHANGELOG.rst | 3 +++ openscenario/openscenario_interpreter/package.xml | 2 +- .../openscenario_interpreter_example/CHANGELOG.rst | 3 +++ openscenario/openscenario_interpreter_example/package.xml | 2 +- openscenario/openscenario_interpreter_msgs/CHANGELOG.rst | 3 +++ openscenario/openscenario_interpreter_msgs/package.xml | 2 +- openscenario/openscenario_preprocessor/CHANGELOG.rst | 3 +++ openscenario/openscenario_preprocessor/package.xml | 2 +- openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst | 3 +++ openscenario/openscenario_preprocessor_msgs/package.xml | 2 +- openscenario/openscenario_utility/CHANGELOG.rst | 3 +++ openscenario/openscenario_utility/package.xml | 2 +- rviz_plugins/openscenario_visualization/CHANGELOG.rst | 3 +++ rviz_plugins/openscenario_visualization/package.xml | 2 +- .../real_time_factor_control_rviz_plugin/CHANGELOG.rst | 3 +++ .../real_time_factor_control_rviz_plugin/package.xml | 2 +- scenario_simulator_v2/CHANGELOG.rst | 3 +++ scenario_simulator_v2/package.xml | 2 +- simulation/behavior_tree_plugin/CHANGELOG.rst | 3 +++ simulation/behavior_tree_plugin/package.xml | 2 +- simulation/do_nothing_plugin/CHANGELOG.rst | 3 +++ simulation/do_nothing_plugin/package.xml | 2 +- simulation/simple_sensor_simulator/CHANGELOG.rst | 3 +++ simulation/simple_sensor_simulator/package.xml | 2 +- simulation/simulation_interface/CHANGELOG.rst | 3 +++ simulation/simulation_interface/package.xml | 2 +- simulation/traffic_simulator/CHANGELOG.rst | 3 +++ simulation/traffic_simulator/package.xml | 2 +- simulation/traffic_simulator_msgs/CHANGELOG.rst | 3 +++ simulation/traffic_simulator_msgs/package.xml | 2 +- test_runner/random_test_runner/CHANGELOG.rst | 7 +++++++ test_runner/random_test_runner/package.xml | 2 +- test_runner/scenario_test_runner/CHANGELOG.rst | 3 +++ test_runner/scenario_test_runner/package.xml | 2 +- 54 files changed, 112 insertions(+), 27 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 79f5c95791b..7818bd23aaa 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package arithmetic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index f9cd2caddf2..82e598ed309 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 1.11.1 + 1.11.2 arithmetic library for scenario_simulator_v2 Tatsuya Yamasaki Apache License 2.0 diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst index 6e69f0fc4b0..dd6e1b8dc59 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package geometry ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index 2b4bf4f171e..ec4dc720b74 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 1.11.1 + 1.11.2 geometry math library for scenario_simulator_v2 application Masaya Kataoka Apache License 2.0 diff --git a/common/scenario_simulator_exception/CHANGELOG.rst b/common/scenario_simulator_exception/CHANGELOG.rst index 5080497050b..768e78c5851 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package scenario_simulator_exception ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 409845dfb12..23ea62dbc6b 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 1.11.1 + 1.11.2 Exception types for scenario simulator Tatsuya Yamasaki Apache License 2.0 diff --git a/common/simple_junit/CHANGELOG.rst b/common/simple_junit/CHANGELOG.rst index b461cabb71c..82e415ab954 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package junit_exporter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 637d4a364f5..8aa65a21565 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 1.11.1 + 1.11.2 Lightweight JUnit library for ROS 2 Masaya Kataoka Tatsuya Yamasaki diff --git a/common/status_monitor/CHANGELOG.rst b/common/status_monitor/CHANGELOG.rst index db5d46a4aff..391664c7b52 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package status_monitor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 0587a9101f8..cb46185e63b 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 1.11.1 + 1.11.2 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index bb170cf731e..e3f6d379f80 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package concealer ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 9e911091986..b1a963ad3bf 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 1.11.1 + 1.11.2 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst index d9188fabfa7..b2f9fda7d63 100644 --- a/external/embree_vendor/CHANGELOG.rst +++ b/external/embree_vendor/CHANGELOG.rst @@ -5,6 +5,9 @@ Changelog for package embree_vendor 0.0.9 (2021-07-13) ------------------ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml index 2f5d0717aa6..1c2df28b919 100644 --- a/external/embree_vendor/package.xml +++ b/external/embree_vendor/package.xml @@ -2,7 +2,7 @@ embree_vendor - 1.11.1 + 1.11.2 vendor packages for intel raytracing kernel library masaya Apache 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 49c41fbbc06..42a37bb86f5 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package kashiwanoha_map ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 71c96a13124..986ad62fbba 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 1.11.1 + 1.11.2 map package for kashiwanoha Masaya Kataoka Apache License 2.0 diff --git a/mock/cpp_mock_scenarios/CHANGELOG.rst b/mock/cpp_mock_scenarios/CHANGELOG.rst index 340d7b17e4b..56abcd3a7a3 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package cpp_mock_scenarios ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- * Merge pull request `#1224 `_ from tier4/fix/remove_headers_in_stl_comment diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index 711e44563f3..ace4e1cc80f 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 1.11.1 + 1.11.2 C++ mock scenarios masaya Apache License 2.0 diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst index ef095e599b5..f635128a8a5 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_experimental_catalog ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 9f46d436088..474e08d458c 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 1.11.1 + 1.11.2 TIER IV experimental catalogs for OpenSCENARIO Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter/CHANGELOG.rst b/openscenario/openscenario_interpreter/CHANGELOG.rst index 610c12b405b..011969f25e5 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_interpreter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 09d7bb76be1..6964f36ad9a 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 1.11.1 + 1.11.2 OpenSCENARIO 1.2.0 interpreter package for Autoware Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_example/CHANGELOG.rst b/openscenario/openscenario_interpreter_example/CHANGELOG.rst index 21a45b33ef2..9f3ee08a89e 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_interpreter_example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 456a83cc784..e977b31b9fc 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 1.11.1 + 1.11.2 Examples for some TIER IV OpenSCENARIO Interpreter's features Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst index 996e1f4503d..d201746474e 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_interpreter_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 004456357ad..c0aa0ed86e3 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 1.11.1 + 1.11.2 ROS message types for package openscenario_interpreter Yamasaki Tatsuya Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor/CHANGELOG.rst b/openscenario/openscenario_preprocessor/CHANGELOG.rst index 5dc1120c8fa..8e3b9f564a9 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_preprocessor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index fa44f3bc001..eafdb1378aa 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 1.11.1 + 1.11.2 Example package for TIER IV OpenSCENARIO Interpreter Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst index c4cda42d091..839923d67c3 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_preprocessor_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 0347dfb864c..b306fe195d0 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 1.11.1 + 1.11.2 ROS message types for package openscenario_preprocessor Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_utility/CHANGELOG.rst b/openscenario/openscenario_utility/CHANGELOG.rst index e36ee8320e8..c3c42344846 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_utility ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 9180bd92a7d..72dfb9ad4f3 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 1.11.1 + 1.11.2 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/rviz_plugins/openscenario_visualization/CHANGELOG.rst b/rviz_plugins/openscenario_visualization/CHANGELOG.rst index 2dcef42c507..671ae38374c 100644 --- a/rviz_plugins/openscenario_visualization/CHANGELOG.rst +++ b/rviz_plugins/openscenario_visualization/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_visualization ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/rviz_plugins/openscenario_visualization/package.xml b/rviz_plugins/openscenario_visualization/package.xml index 2237b721234..61a19a19c2a 100644 --- a/rviz_plugins/openscenario_visualization/package.xml +++ b/rviz_plugins/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 1.11.1 + 1.11.2 Visualization tools for simulation results Masaya Kataoka Kyoichi Sugahara diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst index b3f4ff2c071..ed15ba1ffdf 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package real_time_factor_control_rviz_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml index 43b766c2184..5cc5971c9e8 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml @@ -2,7 +2,7 @@ real_time_factor_control_rviz_plugin - 1.11.1 + 1.11.2 Slider controlling real time factor value. Paweł Lech Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 021a072aff9..53546d1eff3 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index f6ca9df6be8..69af9a2d9ce 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 1.11.1 + 1.11.2 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 diff --git a/simulation/behavior_tree_plugin/CHANGELOG.rst b/simulation/behavior_tree_plugin/CHANGELOG.rst index 3b0eb29ae34..9aa6608e5c9 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package behavior_tree_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 31d130bb22a..f4a734d9b06 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 1.11.1 + 1.11.2 Behavior tree plugin for traffic_simulator masaya Apache 2.0 diff --git a/simulation/do_nothing_plugin/CHANGELOG.rst b/simulation/do_nothing_plugin/CHANGELOG.rst index f648185d2b8..63fa407e2b1 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package do_nothing_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 489822d27d1..7d3f63ca089 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 1.11.1 + 1.11.2 Behavior plugin for do nothing Masaya Kataoka Apache 2.0 diff --git a/simulation/simple_sensor_simulator/CHANGELOG.rst b/simulation/simple_sensor_simulator/CHANGELOG.rst index 90f42fc2a04..f706c369331 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package simple_sensor_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index fc755129014..4aded350472 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 1.11.1 + 1.11.2 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index c61c9001ecf..c88e8017eaf 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package simulation_interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 37519f598b5..8643cddc771 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 1.11.1 + 1.11.2 packages to define interface between simulator and scenario interpreter Masaya Kataoka Apache License 2.0 diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index 6be976129d0..c04d0df13b9 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package traffic_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index 1ca6055b65a..5e3058ef826 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 1.11.1 + 1.11.2 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 51cbe2b265e..4d4fe9524d0 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package openscenario_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index f941442105d..dff4f14cd95 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 1.11.1 + 1.11.2 ROS messages for openscenario Masaya Kataoka Apache License 2.0 diff --git a/test_runner/random_test_runner/CHANGELOG.rst b/test_runner/random_test_runner/CHANGELOG.rst index 9f4a6e4b06b..4f2dcd701e4 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package random_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- +* Merge pull request `#1225 `_ from tier4/fix/remove_warnings_from_random_test_runner + fix -Wreorder warnings in test extcutor class +* fix -Wreorder warnings in test extcutor class +* Contributors: Kotaro Yoshimoto, Masaya Kataoka + 1.11.1 (2024-04-05) ------------------- diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 6befeee6d94..a6eea3b5aae 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 1.11.1 + 1.11.2 Random behavior test runner piotr-zyskowski-rai Apache License 2.0 diff --git a/test_runner/scenario_test_runner/CHANGELOG.rst b/test_runner/scenario_test_runner/CHANGELOG.rst index 10475ea49cf..3715e19d897 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package scenario_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.2 (2024-04-08) +------------------- + 1.11.1 (2024-04-05) ------------------- diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 7e1eeebc945..1f3bd97bd90 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 1.11.1 + 1.11.2 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From ada77d59ffd6545105e40e88e4ad50050062a3d6 Mon Sep 17 00:00:00 2001 From: Release Bot Date: Tue, 9 Apr 2024 06:45:06 +0000 Subject: [PATCH 85/85] Bump version of scenario_simulator_v2 from version 1.11.2 to version 1.11.3 --- common/math/arithmetic/CHANGELOG.rst | 7 ++++++ common/math/arithmetic/package.xml | 2 +- common/math/geometry/CHANGELOG.rst | 7 ++++++ common/math/geometry/package.xml | 2 +- .../CHANGELOG.rst | 7 ++++++ .../scenario_simulator_exception/package.xml | 2 +- common/simple_junit/CHANGELOG.rst | 7 ++++++ common/simple_junit/package.xml | 2 +- common/status_monitor/CHANGELOG.rst | 7 ++++++ common/status_monitor/package.xml | 2 +- external/concealer/CHANGELOG.rst | 7 ++++++ external/concealer/package.xml | 2 +- external/embree_vendor/CHANGELOG.rst | 7 ++++++ external/embree_vendor/package.xml | 2 +- map/kashiwanoha_map/CHANGELOG.rst | 7 ++++++ map/kashiwanoha_map/package.xml | 2 +- mock/cpp_mock_scenarios/CHANGELOG.rst | 7 ++++++ mock/cpp_mock_scenarios/package.xml | 2 +- .../CHANGELOG.rst | 7 ++++++ .../package.xml | 2 +- .../openscenario_interpreter/CHANGELOG.rst | 23 +++++++++++++++++++ .../openscenario_interpreter/package.xml | 2 +- .../CHANGELOG.rst | 7 ++++++ .../package.xml | 2 +- .../CHANGELOG.rst | 7 ++++++ .../openscenario_interpreter_msgs/package.xml | 2 +- .../openscenario_preprocessor/CHANGELOG.rst | 7 ++++++ .../openscenario_preprocessor/package.xml | 2 +- .../CHANGELOG.rst | 7 ++++++ .../package.xml | 2 +- .../openscenario_utility/CHANGELOG.rst | 7 ++++++ openscenario/openscenario_utility/package.xml | 2 +- .../openscenario_visualization/CHANGELOG.rst | 7 ++++++ .../openscenario_visualization/package.xml | 2 +- .../CHANGELOG.rst | 7 ++++++ .../package.xml | 2 +- scenario_simulator_v2/CHANGELOG.rst | 7 ++++++ scenario_simulator_v2/package.xml | 2 +- simulation/behavior_tree_plugin/CHANGELOG.rst | 7 ++++++ simulation/behavior_tree_plugin/package.xml | 2 +- simulation/do_nothing_plugin/CHANGELOG.rst | 7 ++++++ simulation/do_nothing_plugin/package.xml | 2 +- .../simple_sensor_simulator/CHANGELOG.rst | 7 ++++++ .../simple_sensor_simulator/package.xml | 2 +- simulation/simulation_interface/CHANGELOG.rst | 7 ++++++ simulation/simulation_interface/package.xml | 2 +- simulation/traffic_simulator/CHANGELOG.rst | 7 ++++++ simulation/traffic_simulator/package.xml | 2 +- .../traffic_simulator_msgs/CHANGELOG.rst | 7 ++++++ simulation/traffic_simulator_msgs/package.xml | 2 +- test_runner/random_test_runner/CHANGELOG.rst | 7 ++++++ test_runner/random_test_runner/package.xml | 2 +- .../scenario_test_runner/CHANGELOG.rst | 7 ++++++ test_runner/scenario_test_runner/package.xml | 2 +- 54 files changed, 232 insertions(+), 27 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 7818bd23aaa..d00bfee7a93 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package arithmetic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index 82e598ed309..6142a129368 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 1.11.2 + 1.11.3 arithmetic library for scenario_simulator_v2 Tatsuya Yamasaki Apache License 2.0 diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst index dd6e1b8dc59..3881b5d0ff2 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package geometry ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index ec4dc720b74..afc684f0ac7 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 1.11.2 + 1.11.3 geometry math library for scenario_simulator_v2 application Masaya Kataoka Apache License 2.0 diff --git a/common/scenario_simulator_exception/CHANGELOG.rst b/common/scenario_simulator_exception/CHANGELOG.rst index 768e78c5851..0711999e9e1 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package scenario_simulator_exception ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 23ea62dbc6b..9da1d8dfee9 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 1.11.2 + 1.11.3 Exception types for scenario simulator Tatsuya Yamasaki Apache License 2.0 diff --git a/common/simple_junit/CHANGELOG.rst b/common/simple_junit/CHANGELOG.rst index 82e415ab954..ef62923d74a 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package junit_exporter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 8aa65a21565..e8e1b7c1f85 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 1.11.2 + 1.11.3 Lightweight JUnit library for ROS 2 Masaya Kataoka Tatsuya Yamasaki diff --git a/common/status_monitor/CHANGELOG.rst b/common/status_monitor/CHANGELOG.rst index 391664c7b52..39a0c3aa114 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package status_monitor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index cb46185e63b..62cc99ed916 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 1.11.2 + 1.11.3 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index e3f6d379f80..7a75a3866d4 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package concealer ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/external/concealer/package.xml b/external/concealer/package.xml index b1a963ad3bf..0546395848d 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 1.11.2 + 1.11.3 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/external/embree_vendor/CHANGELOG.rst b/external/embree_vendor/CHANGELOG.rst index b2f9fda7d63..c59088db103 100644 --- a/external/embree_vendor/CHANGELOG.rst +++ b/external/embree_vendor/CHANGELOG.rst @@ -5,6 +5,13 @@ Changelog for package embree_vendor 0.0.9 (2021-07-13) ------------------ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/external/embree_vendor/package.xml b/external/embree_vendor/package.xml index 1c2df28b919..3eb2d4348ab 100644 --- a/external/embree_vendor/package.xml +++ b/external/embree_vendor/package.xml @@ -2,7 +2,7 @@ embree_vendor - 1.11.2 + 1.11.3 vendor packages for intel raytracing kernel library masaya Apache 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 42a37bb86f5..e9da25b5fcc 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package kashiwanoha_map ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 986ad62fbba..0c06e0df682 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 1.11.2 + 1.11.3 map package for kashiwanoha Masaya Kataoka Apache License 2.0 diff --git a/mock/cpp_mock_scenarios/CHANGELOG.rst b/mock/cpp_mock_scenarios/CHANGELOG.rst index 56abcd3a7a3..1e2ed6a4856 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package cpp_mock_scenarios ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index ace4e1cc80f..ef8a043331e 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 1.11.2 + 1.11.3 C++ mock scenarios masaya Apache License 2.0 diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst index f635128a8a5..dcfb781eef1 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package openscenario_experimental_catalog ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 474e08d458c..2eab13edfd0 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 1.11.2 + 1.11.3 TIER IV experimental catalogs for OpenSCENARIO Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter/CHANGELOG.rst b/openscenario/openscenario_interpreter/CHANGELOG.rst index 011969f25e5..f2c5a74d226 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -2,6 +2,29 @@ Changelog for package openscenario_interpreter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge pull request `#1220 `_ from tier4/refactor/basic_types + Stop using ROS messages as basic types in `openscenario_interpreter` +* Merge branch 'master' into refactor/basic_types +* chore: apply linter +* chore: make another version of Properties::get to suite new form of basic types of openscenario_interpreter/syntax +* chore: fixed tests for structures that became trivial +* refactor: stop marking as const to members of Orientation +* refactor: stop using explicit keyword to default constructors +* refactor: stop using explicit keyword to default constructors +* refactor: remove redundant code according to N4659 (6.1) + Co-authored-by: Tatsuya Yamasaki +* refactor: remove redundant code according to N4659 (6.1) + Co-authored-by: Tatsuya Yamasaki +* refactor: remove redundant code according to N4659 (6.1) + Co-authored-by: Tatsuya Yamasaki +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* chore: apply linter +* refactor(openscenario_interpreter): delete ros messages from basic types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 6964f36ad9a..4aefed35e33 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 1.11.2 + 1.11.3 OpenSCENARIO 1.2.0 interpreter package for Autoware Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_example/CHANGELOG.rst b/openscenario/openscenario_interpreter_example/CHANGELOG.rst index 9f3ee08a89e..848f7aa6042 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package openscenario_interpreter_example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index e977b31b9fc..47449f6469b 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 1.11.2 + 1.11.3 Examples for some TIER IV OpenSCENARIO Interpreter's features Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst index d201746474e..615325c2f7c 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package openscenario_interpreter_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index c0aa0ed86e3..d49f40fafad 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 1.11.2 + 1.11.3 ROS message types for package openscenario_interpreter Yamasaki Tatsuya Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor/CHANGELOG.rst b/openscenario/openscenario_preprocessor/CHANGELOG.rst index 8e3b9f564a9..279be7cf41f 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package openscenario_preprocessor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index eafdb1378aa..904a58ca59d 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 1.11.2 + 1.11.3 Example package for TIER IV OpenSCENARIO Interpreter Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst index 839923d67c3..aaf5e9823c7 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package openscenario_preprocessor_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index b306fe195d0..c8931ce5bef 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 1.11.2 + 1.11.3 ROS message types for package openscenario_preprocessor Kotaro Yoshimoto Apache License 2.0 diff --git a/openscenario/openscenario_utility/CHANGELOG.rst b/openscenario/openscenario_utility/CHANGELOG.rst index c3c42344846..ee70d6df75c 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package openscenario_utility ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 72dfb9ad4f3..f183843c341 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 1.11.2 + 1.11.3 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/rviz_plugins/openscenario_visualization/CHANGELOG.rst b/rviz_plugins/openscenario_visualization/CHANGELOG.rst index 671ae38374c..2e56960ae02 100644 --- a/rviz_plugins/openscenario_visualization/CHANGELOG.rst +++ b/rviz_plugins/openscenario_visualization/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package openscenario_visualization ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/rviz_plugins/openscenario_visualization/package.xml b/rviz_plugins/openscenario_visualization/package.xml index 61a19a19c2a..b741c069698 100644 --- a/rviz_plugins/openscenario_visualization/package.xml +++ b/rviz_plugins/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 1.11.2 + 1.11.3 Visualization tools for simulation results Masaya Kataoka Kyoichi Sugahara diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst index ed15ba1ffdf..d0d4b0d3019 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package real_time_factor_control_rviz_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml index 5cc5971c9e8..4035aa98655 100644 --- a/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml +++ b/rviz_plugins/real_time_factor_control_rviz_plugin/package.xml @@ -2,7 +2,7 @@ real_time_factor_control_rviz_plugin - 1.11.2 + 1.11.3 Slider controlling real time factor value. Paweł Lech Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 53546d1eff3..2d91b3a569b 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 69af9a2d9ce..19ec4af4084 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 1.11.2 + 1.11.3 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 diff --git a/simulation/behavior_tree_plugin/CHANGELOG.rst b/simulation/behavior_tree_plugin/CHANGELOG.rst index 9aa6608e5c9..336090019ba 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package behavior_tree_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index f4a734d9b06..b67fd1fb60c 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 1.11.2 + 1.11.3 Behavior tree plugin for traffic_simulator masaya Apache 2.0 diff --git a/simulation/do_nothing_plugin/CHANGELOG.rst b/simulation/do_nothing_plugin/CHANGELOG.rst index 63fa407e2b1..0f20942ede7 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package do_nothing_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 7d3f63ca089..f4ac12b0917 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 1.11.2 + 1.11.3 Behavior plugin for do nothing Masaya Kataoka Apache 2.0 diff --git a/simulation/simple_sensor_simulator/CHANGELOG.rst b/simulation/simple_sensor_simulator/CHANGELOG.rst index f706c369331..4bd73407ee4 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package simple_sensor_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 4aded350472..57a954b71f7 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 1.11.2 + 1.11.3 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index c88e8017eaf..f4c44bea45a 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package simulation_interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 8643cddc771..f71bf1b2ea5 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 1.11.2 + 1.11.3 packages to define interface between simulator and scenario interpreter Masaya Kataoka Apache License 2.0 diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index c04d0df13b9..6eddfa0c171 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package traffic_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index 5e3058ef826..061a3beaba0 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 1.11.2 + 1.11.3 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 4d4fe9524d0..d9a9068b3fd 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package openscenario_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index dff4f14cd95..1fd28b8ea37 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 1.11.2 + 1.11.3 ROS messages for openscenario Masaya Kataoka Apache License 2.0 diff --git a/test_runner/random_test_runner/CHANGELOG.rst b/test_runner/random_test_runner/CHANGELOG.rst index 4f2dcd701e4..b47d952d954 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package random_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- * Merge pull request `#1225 `_ from tier4/fix/remove_warnings_from_random_test_runner diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index a6eea3b5aae..4452bb571d6 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 1.11.2 + 1.11.3 Random behavior test runner piotr-zyskowski-rai Apache License 2.0 diff --git a/test_runner/scenario_test_runner/CHANGELOG.rst b/test_runner/scenario_test_runner/CHANGELOG.rst index 3715e19d897..b681c3a6c08 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -2,6 +2,13 @@ Changelog for package scenario_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.11.3 (2024-04-09) +------------------- +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Merge branch 'master' into refactor/basic_types +* Contributors: Kotaro Yoshimoto, Tatsuya Yamasaki + 1.11.2 (2024-04-08) ------------------- diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 1f3bd97bd90..e8df2c5f064 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 1.11.2 + 1.11.3 scenario test runner package Tatsuya Yamasaki Apache License 2.0