From e33395fb4bec1576b71de9ca5fb3d1afe77599f8 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 13 Nov 2023 17:19:38 +0900 Subject: [PATCH 001/245] update CHANGELOG Signed-off-by: Masaya Kataoka --- common/math/arithmetic/CHANGELOG.rst | 19 ++ common/math/geometry/CHANGELOG.rst | 144 +++++++++++ .../CHANGELOG.rst | 31 +++ common/simple_junit/CHANGELOG.rst | 27 ++ common/status_monitor/CHANGELOG.rst | 18 ++ external/concealer/CHANGELOG.rst | 142 ++++++++++ map/kashiwanoha_map/CHANGELOG.rst | 18 ++ mock/cpp_mock_scenarios/CHANGELOG.rst | 61 +++++ .../CHANGELOG.rst | 23 ++ .../openscenario_interpreter/CHANGELOG.rst | 146 +++++++++++ .../CHANGELOG.rst | 18 ++ .../CHANGELOG.rst | 18 ++ .../openscenario_preprocessor/CHANGELOG.rst | 22 ++ .../CHANGELOG.rst | 22 ++ .../openscenario_utility/CHANGELOG.rst | 18 ++ .../openscenario_visualization/CHANGELOG.rst | 18 ++ scenario_simulator_v2/CHANGELOG.rst | 18 ++ simulation/behavior_tree_plugin/CHANGELOG.rst | 84 ++++++ simulation/do_nothing_plugin/CHANGELOG.rst | 56 ++++ .../simple_sensor_simulator/CHANGELOG.rst | 118 +++++++++ simulation/simulation_interface/CHANGELOG.rst | 83 ++++++ simulation/traffic_simulator/CHANGELOG.rst | 244 ++++++++++++++++++ .../traffic_simulator_msgs/CHANGELOG.rst | 24 ++ test_runner/random_test_runner/CHANGELOG.rst | 56 ++++ .../scenario_test_runner/CHANGELOG.rst | 129 +++++++++ 25 files changed, 1557 insertions(+) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 16478b074f0..88e9f358514 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -2,6 +2,25 @@ Changelog for package arithmetic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/common/math/geometry/CHANGELOG.rst b/common/math/geometry/CHANGELOG.rst index b3542d2fdc3..14335d6653f 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -2,6 +2,150 @@ Changelog for package geometry ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge pull request `#1102 `_ from tier4/fix/wrong_distance + Change possibly wrong subtraction of distance calculation to assignment +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Change subtraction to assignment +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1019 `_ from tier4/feature/fallback_spline_to_line_segments + Feature/fallback spline to line segments +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* fix case +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix format +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* fix typo +* add torelance +* fix getSValue function in line segment class +* add getSValue function +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* use auto +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* add member initializer +* add test case +* fix problem in total_length in CatmullRomSpline class +* use push_back +* add comment +* update comment +* add comment +* fix comment +* fix typo +* add white line +* add white line +* fix typo +* fix typo +* remove plot +* add comment +* udpate comment +* add comment +* add comment +* apply reformat +* update comment +* add gnupolot files +* update comment +* fix comment +* update if +* add comment +* add comment +* add auto scale +* add test case +* fix denormalize +* add comment +* add comment +* add comment +* use auto and -> +* use & +* use auto -> +* remove unused header +* use auto and -> +* add const +* update comment +* add description +* care edge case +* simplify code +* update comment +* update comment +* update comment +* fix typo +* add error message +* add comment +* add test case +* add comment +* add comment +* add comment +* add test case +* update test case +* remove unused function +* add autoscale to the line segment +* update description +* add description +* fix autoscale feature +* add comment +* fix typo +* enable fallback for each functions +* fix some of member function +* add white line for visibility +* add message +* add comment +* remove unused line +* add comment +* add comments +* add comment +* add comment +* add comment +* add test case +* add test case +* add docs +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* add test case +* add test case +* add test case +* fix calculate s value +* fix getLineSegments function +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* enable check collision to the point +* add functions +* simplify code +* add const +* use lambda +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Shota Minami, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/common/scenario_simulator_exception/CHANGELOG.rst b/common/scenario_simulator_exception/CHANGELOG.rst index 91125859403..eebdb824cb3 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -2,6 +2,37 @@ Changelog for package scenario_simulator_exception ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* add define error category +* add SpecificationViolation +* update Doxyfile +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* ref(openscenario_interpreter): revert comments format +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(openscenario_interpreter): inherit ScenarioFailure and tidy up +* feat(openscenario_interpreter): mv ScenarioError, add catch InitActions +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(openscenario_interpreter): improve exception for detail result msg +* feat(openscenario_interpreter): first step detail result msg +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/common/simple_junit/CHANGELOG.rst b/common/simple_junit/CHANGELOG.rst index 5221c2efed8..c55c0d8a46e 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -2,6 +2,33 @@ Changelog for package junit_exporter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* fix typo +* update Doxyfile +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/common/status_monitor/CHANGELOG.rst b/common/status_monitor/CHANGELOG.rst index 1bc3d9cab6f..e7520220aa4 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -2,6 +2,24 @@ Changelog for package status_monitor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index 25b75878e26..45e6ec8baea 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -2,6 +2,148 @@ Changelog for package concealer ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* update Doxyfile +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#1106 `_ from tier4/fix/rtc_command_action/continuous_execution + Fix/rtc command action/continuous execution +* Merge pull request `#997 `_ from tier4/feature/allow-goal-modification + Feature/allow goal modification +* doc(concealer): add notes for RTC used status filter +* refactor: service_with_validation.hpp +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* refactor(concealer): delete debug print +* chore(concealer): delete unnecessary line break +* chore(concealer): delete unnecessary line break +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* unnecesary check removed +* fix(concealer): fix capture +* refactor(concealer): add const to requestAutoModeForCooperation +* refactor(concealer): mark isPackageExists as noexcept +* chore(concealer): roll back the number of retries for setVelocityLimit +* chore: update comments +* Move some metafunctions into new header files +* Update `plan` to check that `SetRoutePoints::Requst` has the data member `option` +* removed leftover include +* Cleanup +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* fix(concealer): ignore timeout with engage service +* fix(concealer): set long validation interval for /api/routing/set_route_points +* feat(concealer): support modifying validation interval of ServiceWithValidation +* fix(concealer): allow timeout for requestInitialPose +* feat(concealer): add timeout exception class for ServiceWithValidation +* feat(concealer): enable timeout validation switching for ServiceWithValidation +* feat(concealer): add support for autoware_adapi_v1_msgs::msg::ResponseStatus for service response validation in ServiceWithValidation +* fix(concealer): revive ServiceWithValidation::validateAvailability and fix logic +* added has_include condition for localization state related code +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore(concealer): modify maximum number of retry for set velocity limit service +* refactor: service_with_validation.hpp +* refactor(concealer): organize order of class member variable +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(concealer): organize order of class member variable +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore: apply linter +* refactor(concealer): add is_package_exists.hpp +* refactor(concealer): stop using utility directory +* fix(concealer): fix the history filter of cooperate statuses +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* fix(concealer): fix build errors +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1060 `_ from tier4/AJD-805/baseline_update_rebased + feat: Update topics and services to be compatible with the latest AD API +* fix(concealer): fix failure handling for service response +* clang format +* sending initial pose only when localizaiton is uninitialized +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* fix(concealer): add history filter for rtc command +* chore: apply linter +* feat(concealer): use task_queue to send RTC service request +* feat(concealer): import latest ServiceWithValidation class from RobotecAI's work +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Apply review changes +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: delete cooperator +* fix(concealer): fix compile errors +* feat(concealer): update interface for rtc auto mode +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* feat(concealer): add empty implementation of requestAutoModeForCooperation +* refactor(concealer): delete concealer::cooperate, approve +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix clang format error +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* sending initial pose rate limited +* checkpoints reintroduced +* brought back velocity limit and cooperate commands +* commented clock and parts of concealer +* Run clang format +* Delete comments and new lines +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Regression: revert change operation mode to engage due to engage request after stopping +* Regression: fix autoware state naming +* Regression: stop overriding mrm state and behavior +* Update /autoware/state to /api/iv_msgs/autoware/state OLD AD API +* Implement /api/routing/set_route_points AD API +* Update getTrajectory topic type +* Revert "WIP: get and sets for vehicle status" + This reverts commit bf9d0d2f86fcf729f015ba9312fdc830279a4124. +* WIP: get and sets for vehicle status +* Implement /api/external/get/emergency topic from tier4 external api +* Revert "WIP: add ADAPI support in service with validation" + This reverts commit 944a04fa30e786e79a8517dce88d0bb8b81f207e. +* Implement /api/localization/initialize service for position initialization +* Implement /api/operation_mode/change_to_autonomous to engage +* WIP: add ADAPI support in service with validation +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Cleanup +* Update `concealer` to use service SetRoutePoints +* Add the property `allowGoalModification` to switch destination topics +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index a619ea8ef60..8e9966d6d85 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -2,6 +2,24 @@ Changelog for package kashiwanoha_map ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/mock/cpp_mock_scenarios/CHANGELOG.rst b/mock/cpp_mock_scenarios/CHANGELOG.rst index 909f149ab85..6c39234ddf1 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -2,6 +2,67 @@ Changelog for package cpp_mock_scenarios ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* fix compile error +* add namespace +* update namespace +* add concealer +* rename scenario class +* add namespace +* rename scenario classes +* add namespace +* add cpp_mock_scenarios +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1080 `_ from tier4/doc/add_comment_for_pr_1074 + add comment about PR `#1074 `_ +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* add comment about PR `#1074 `_ +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status diff --git a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst index 74363a536c3..77db40f497f 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -2,6 +2,29 @@ Changelog for package openscenario_experimental_catalog ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* sample awsim scenario added, model3d added to sample vehicle catalogue +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_interpreter/CHANGELOG.rst b/openscenario/openscenario_interpreter/CHANGELOG.rst index 00e28e2b741..6e06124e40d 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -2,6 +2,152 @@ Changelog for package openscenario_interpreter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1121 `_ from tier4/fix/sign-of-relative-distance + Fix/sign of relative distance +* Add comments about the historical background of `RelativeDistanceCondition`'s behavior +* Fix some `RelativeDistanceCondition` mode to return non-negative value +* chore: apply linter +* refactor: renamed 'setTrafficLightConfidence' to 'setConventionalTrafficLightConfidence' +* feat(openscenario_interpreter): add PseudoTrafficSignalDetectorConfidenceSetAction@v1 +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#997 `_ from tier4/feature/allow-goal-modification + Feature/allow goal modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* feat: add error message for featureIdentifiersRequiringExternalPermissionForAutonomousDecisions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* change default port to 5555 +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(simulator_core): use featureIdentifiersRequiringExternalPermissionForAutonomousDecisions instead of manualModules +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1075 `_ from tier4/feature/RJD-96_detail_message_scenario_failure + feat(openscenario_interpreter): Detail the message in case of scenario failure +* change default port to 8080 +* ref(openscenario_interpreter): apply clang format +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): ref SpecialAction +* change port +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* code refactor +* Merge branch 'master' into feature/freespace-distance-condition +* Implement getBoundingBox* functions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* feat(openscenario_interpreter): parse manualModules +* refactor: delete cooperator +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge pull request `#1083 `_ from tier4/fix/distance-condition + fix/distance-condition +* Replace `LaneletId` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* ref(openscenario_interpreter): detailed result msg - last improve +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* ref(openscenario_interpreter): revert missing comment +* ref(openscenario_interpreter): revert comments format +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - third step +* Initial version of freespace distance condition +* remove workbound for galactic +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - second step +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - first step +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* fix: cast result to double in order to correctly compare equals values +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* ref(scenario_failure): remove blank lines +* ref(scenario_failure): remove blank lines +* ref(openscenario_interpreter): improve ScenarioFailure +* feat(openscenario_interpreter): inherit ScenarioFailure and tidy up +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): improve detailed failure message +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): improve ScenarioFailure +* feat(openscenario_interpreter): mv ScenarioError, add catch InitActions +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat(openscenario_interpreter): attach traffic light detector emulator in applyAssignControllerAction +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(openscenario_interpreter): improve exception for detail result msg +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* feat(openscenario_interpreter): first step detail result msg +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Add the property `allowGoalModification` to switch destination topics +* Remove debug prints that were left unintentionally +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status diff --git a/openscenario/openscenario_interpreter_example/CHANGELOG.rst b/openscenario/openscenario_interpreter_example/CHANGELOG.rst index 1c56c2d8ec1..09fb2d8d0ae 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -2,6 +2,24 @@ Changelog for package openscenario_interpreter_example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst index ef59b8fb772..0da2a3569e6 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -2,6 +2,24 @@ Changelog for package openscenario_interpreter_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_preprocessor/CHANGELOG.rst b/openscenario/openscenario_preprocessor/CHANGELOG.rst index 284a151fa47..66d72b99902 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -2,6 +2,28 @@ Changelog for package openscenario_preprocessor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst index 6c29bc976f2..91190cf375b 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -2,6 +2,28 @@ Changelog for package openscenario_preprocessor_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_utility/CHANGELOG.rst b/openscenario/openscenario_utility/CHANGELOG.rst index 898ea33b73d..08700a0cc55 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -2,6 +2,24 @@ Changelog for package openscenario_utility ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index 9e2abceb50d..7ca9d797ffd 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -2,6 +2,24 @@ Changelog for package openscenario_visualization ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 69fc6232a5f..9aceaa9dc88 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,6 +2,24 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/simulation/behavior_tree_plugin/CHANGELOG.rst b/simulation/behavior_tree_plugin/CHANGELOG.rst index b0b1f912f32..c0f99644525 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -2,6 +2,90 @@ Changelog for package behavior_tree_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* Merge remote-tracking branch 'origin/master' into feature/deleted-entity +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#1104 `_ from tier4/fix/entities-right-of-way + Fix/entities right of way +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* fix(action_node): calculate the backward distance in getYieldStopDistance +* fix(action_node): check if is not the same right of way for two diffrent lanelets +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1019 `_ from tier4/feature/fallback_spline_to_line_segments + Feature/fallback spline to line segments +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(behavior_tree): add FollowPolyline action to pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Update `makeUpdatedStatus` to take a reference to `PolylineTrajectory` instead of a pointer +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/simulation/do_nothing_plugin/CHANGELOG.rst b/simulation/do_nothing_plugin/CHANGELOG.rst index 03c8bf90415..de43e0f62da 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -2,6 +2,62 @@ Changelog for package do_nothing_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/simulation/simple_sensor_simulator/CHANGELOG.rst b/simulation/simple_sensor_simulator/CHANGELOG.rst index 6ef4f6851f6..4fd26030bb6 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -2,6 +2,124 @@ Changelog for package simple_sensor_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* refactor: reflect the reviews +* refactor(simple_sensor_simulator): delete name of unused argument to suppress warnings +* change default port to 5555 +* change default port to 8080 +* change port +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* refactor(traffic_simulator): change to a comparison method that is resistant to version changes +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor(simple_sensor_simulator): add explicit keyword to constructor + Co-authored-by: Tatsuya Yamasaki +* refactor(simple_sensor_simulator): TrafficLightDetectorEmulator => PseudoTrafficLightDetector + Co-authored-by: Tatsuya Yamasaki +* refactor(simple_sensor_simulator): TrafficLightDetectorEmulator => PseudoTrafficLightDetector + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* chore: change architecture_type to awf/universe/20230906 +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Update `update` to use `updateStatus` instead of `setStatus` +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update the Ego entity's FollowTrajectoryAction to take into account the vehicle model type +* Update yaw calculation during `FollowTrajectoryAction` for Ego entities +* Rename argument `time` to `current_scenario_time` +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* Merge remote-tracking branch 'origin/ref/RJD-553_restore_repeated_update_entity_status' into pzyskowski/660/ss2-awsim-connection +* Update `EgoEntitySimulation::update` to follow trajectory if is given +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: apply formatter +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update `followPolylineTrajectory` to store the given trajectory to ego +* Simplify member function `ScenarioSimulator::isEgo` +* Simplify member function `ScenarioSimulator::isEntityExists` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* fix(simple_sensor_simulator): update topic name for conventional traffic light +* refactor(simple_sensor_simulator): delete debug code +* refactor(simple_sensor_simulator): move include +* feat: add new architecture_type awf/universe/2023.08 +* refactor: delete unused lines/files +* refactor(simple_sensor_simulator): delete TrafficLightsDetectorBase +* chore: apply formatter +* feat(simple_sensor_simulator): implement ScenarioSimulator::attachTrafficLightDetectorEmulator +* refactor(simple_sensor_simulator): use TrafficLightPublisher in simple_sensor_simulator +* refactor(simple_sensor_simulator): use UpdateTrafficLightsRequest as a type for storing +* feat(simple_sensor_simulator): add base class for TrafficLightsDetector +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Revert "WIP: get and sets for vehicle status" + This reverts commit bf9d0d2f86fcf729f015ba9312fdc830279a4124. +* WIP: get and sets for vehicle status +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 5d83f2ff98e..8e5c13221a8 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -2,6 +2,89 @@ Changelog for package simulation_interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor(simulation_interface) + Co-authored-by: Tatsuya Yamasaki +* refactor(simulation_interface) + Co-authored-by: Tatsuya Yamasaki +* Update simulation/simulation_interface/include/simulation_interface/conversions.hpp + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* chore: apply formatter +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: apply formatter +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* refactor: delete unused code / dependencies +* refactor(simulation_interface): delete unused conversion +* refactor(traffic_simulator): refactor data flow with simulation_api_schema::TrafficSignal +* refactor(simulation_interface/zmq_client): remove duplicated traffic light detector emulator call +* feat(simulator_interface): add support for autoware_msgs +* feat(simulator_interface): add AttachTrafficLightDetectorEmulatorRequest to ZMQ client/server +* chore(traffic_simulator): reformat +* feat(simlation_interface): add call function for AttachTrafficLightDetectorEmulatorRequest +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(simulation_interface): attachTrafficLightDetectorEmulatorRequest/Response +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index 30f9397e13b..9eb9f8eec18 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -2,6 +2,250 @@ Changelog for package traffic_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* fix: modify comment in traffic_light.hpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* fix: build errors +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* Merge remote-tracking branch 'origin/master' into fix/sign-of-relative-distance +* Merge pull request `#1096 `_ from tier4/feature/deleted-entity + Support for de-spawning entity +* Update simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/data_type/speed_change.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/data_type/speed_change.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/entity/entity_base.hpp + Co-authored-by: Tatsuya Yamasaki +* add clang-format off +* refactor: reflect the reviews +* update doxyfile +* add simulation package +* add comment +* refactor: renamed 'setTrafficLightConfidence' to 'setConventionalTrafficLightConfidence' +* update Doxyfile +* fix(traffic_simulator): update setTrafficLightConfidence function to handle multiple TrafficLights +* fix(traffic_simulator): fix build errors +* feat(openscenario_interpreter): add PseudoTrafficSignalDetectorConfidenceSetAction@v1 +* feat(traffic_simulator): add EntityManager::setTrafficLightConfidence +* feat(traffic_simulator): move confidence field from Bulb class to TrafficLight class +* feat: invalidate status in deleted entity +* feat: remove DELETED entity type by using internal id +* feat: add deleted entity to traffic simulator +* feat(traffic_simulator): add confidence to Bulb class +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore: apply clang_format +* feat(traffic_simualtor): set use_foa=true to use default auto_mode settings +* Merge pull request `#1101 `_ from tier4/fix/standstill_duration + add updateStandStillDuration(step_time) and updateTraveledDistance(st… +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* add updateStandStillDuration(step_time) and updateTraveledDistance(step_time) when the entity failed to match lanelet +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Implement getBoundingBox* functions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* fix spelling +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(behavior_tree): add FollowPolyline action to pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* remove debug line +* fix case +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Rename `gelAllCanonicalizedLaneletPoses` to `get...` +* Cleanup +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Replace `LaneletId` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* chore: apply formatter +* refactor(HdMapUtils): rename functions related to traffic light +* refactor(traffic_simulator): change to a comparison method that is resistant to version changes +* refactor(traffic_simulator): delete unnecessary optimization +* fix(traffic_simulator): fix build errors +* chore(traffic_simulator): add LaneletId alias +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor: use better word "thunk" instead of callback + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator): use LaneletId instead of std::int64_t + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator) + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator) + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* apply reformat +* Initial version of freespace distance condition +* remove workbound for galactic +* chore: apply formatter +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* chore: change architecture_type to awf/universe/20230906 +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* apply reformat +* refactor: apply formatter with clang-format v14 +* reintroduced clock publshing +* add getSValue function +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* add white space +* apply reformat +* commented clock and parts of concealer +* refactor: apply formatter +* refactor: delete debug messages +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* chore: apply formatter +* fix(TrafficLight): delete relation_id in TrafficLight class and use latest getTrafficLightRelationIDFromWayID +* fix(HDMapUtils): return all relation ids from getTrafficLightRelationIDFromWayID +* apply reformat +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update `makeUpdatedStatus` to take a reference to `PolylineTrajectory` instead of a pointer +* apply reformat +* fix(traffic_simulator/ego): switch a parameter for new architecture_type +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* refactor: delete unused code / dependencies +* feat: add new architecture_type awf/universe/2023.08 +* chore: apply formatter +* refactor: delete unused lines/files +* feat(traffic_simulator): implement conversion from way_id to relation_id +* refactor(traffic_simulator): fix initialization order of member variables in ConfigurableRateUpdater +* chore: apply formatter +* fix(traffic_simulator): fix compile errors +* refactor(traffic_simulator): refactor data flow with simulation_api_schema::TrafficSignal +* refactor(traffic_simulator): refactor ConfigurableRateUpdater +* refactor(traffic_simulator): delete V2ITrafficLightPublisher and use TrafficLightPublisher +* feat(traffic_simulator): use new ConfigurableRateUpdater in TrafficLightMarkerPublisher +* feat(traffic_simulator): implement proto exporting from TrafficLightManager +* feat(traffic_simulator): Add TrafficLightPublisher +* refactor(traffic_simulator): refactor ConfigurableRateUpdater +* refactor(traffic_simulator): delete unused files +* feat(simple_sensor_simulator): add base class for TrafficLightsDetector +* fix(traffic_simulator): fix build errors +* chore(traffic_simulator): reformat +* fix(traffic_simulator): use new message in V2ITrafficLightPublisher +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* fix(traffic_simulator): fix V2ITrafficLightPublisher +* feat(simulation_interface): attachTrafficLightDetectorEmulatorRequest/Response +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* chore(traffic_light): apply ament_clang_format +* refactor(traffic_light): use new architecture_type +* chore(traffic_light): delay creating publisher +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt +* chore(traffic_light): override pure virtual function +* chore(traffic_light): delete empty files +* chore(traffic_light): adapt to variations of traffic light bulb types +* fix(entity_manager): fix errors for traffic light tests +* feat(entity_manager): use new traffic light managers in entity_manager +* feat(traffic_light): add codes for new message +* chore(traffic_light): prepare for runtime topic adaptation +* chore(traffic_light): delete TrafficLightManager type specialization +* chore(traffic_light): rename timers +* chore(traffic_light): set relation_id for new message type +* chore(traffic_light): add template for TrafficLight::Bulb conversion operator +* chore(traffic_light): fix errors +* fix(HDMapUtils): getTrafficLightRelationIDFromWayID +* chore: reformat +* feat(HDMapUtils): getTrafficLightRelationIDFromWayID +* chore(traffic_light): add perception messages for traffic light +* refactor(traffic_light): use TrafficLightBase +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* refactor(traffic_light): use updated function name +* feat(traffic_light): add TrafficLightBase and parameterize msg type of TrafficLight +* refactor(HDMapUtil): rename some functions +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, f0reachARR, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 3d25341b13d..f62b33eb088 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -2,6 +2,30 @@ Changelog for package openscenario_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* feat: remove DELETED entity type by using internal id +* feat: add deleted entity to traffic simulator +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, f0reachARR, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/test_runner/random_test_runner/CHANGELOG.rst b/test_runner/random_test_runner/CHANGELOG.rst index 1df743dd0a2..4a89673b455 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -2,6 +2,62 @@ Changelog for package random_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* change default port to 5555 +* change default port to 8080 +* change port +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* chore: change architecture_type to awf/universe/20230906 +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat: add new architecture_type awf/universe/2023.08 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status diff --git a/test_runner/scenario_test_runner/CHANGELOG.rst b/test_runner/scenario_test_runner/CHANGELOG.rst index 26ce2ab262f..73bd587c897 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -2,6 +2,135 @@ Changelog for package scenario_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Forthcoming +----------- +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1121 `_ from tier4/fix/sign-of-relative-distance + Fix/sign of relative distance +* Merge remote-tracking branch 'origin/master' into fix/sign-of-relative-distance +* Merge pull request `#1096 `_ from tier4/feature/deleted-entity + Support for de-spawning entity +* Update test scenario to not expect negative distance for `RelativeDistanceCondition` in non-lane coordinate systems +* feat: update CustomCommandAction.PseudoTrafficSignalDetectorConfidenceSetAction@v1.yaml +* chore: update author of sample scenario +* chore: add example scenario of DeleteEntityAction +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* fix: destination of CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* feat: add continuous rtc action execution in CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* refactor: delete cooperator property from CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* change default port to 5555 +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(simulator_core): use featureIdentifiersRequiringExternalPermissionForAutonomousDecisions instead of manualModules +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1075 `_ from tier4/feature/RJD-96_detail_message_scenario_failure + feat(openscenario_interpreter): Detail the message in case of scenario failure +* change default port to 8080 +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* change port +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* feat: update scenario for new RTC feature +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(test_runner): add FollowTrajectoryAction for bicycle and pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix(test_runner): fix scenarios directory +* feat(scenario_test_runner): add workflow for simulation failure - detailed message +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Initial version of freespace distance condition +* chore: change architecture_type to awf/universe/20230906 +* misc object updated in sample awsim +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* updated npc in awsim_sample scenario +* Update `update` to use `updateStatus` instead of `setStatus` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* added MiscObject to awsim_sample scenario +* fixed map path +* added modifier to awsim sample scenario +* sample awsim scenario added, model3d added to sample vehicle catalogue +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Add new test scenario `RoutingAction.FollowTrajectoryAction-autoware` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat: add new architecture_type awf/universe/2023.08 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, f0reachARR, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status From 7ec1744040b2c8fd8e2d1bcc6a7d1600cea0425b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 14:32:48 +0900 Subject: [PATCH 002/245] update Release Action Signed-off-by: Masaya Kataoka --- .github/workflows/CheckAndCommentAction.yaml | 44 ------------ .github/workflows/Docker.yaml | 47 ------------ .github/workflows/Documentation.yaml | 71 ------------------- .github/workflows/DocumentationLinkCheck.yaml | 23 ------ .../InterfaceUpdateNotification.yaml | 29 -------- .github/workflows/Release.yaml | 38 ++++------ .github/workflows/custom_spell.json | 46 ------------ 7 files changed, 13 insertions(+), 285 deletions(-) delete mode 100644 .github/workflows/CheckAndCommentAction.yaml delete mode 100644 .github/workflows/Docker.yaml delete mode 100644 .github/workflows/Documentation.yaml delete mode 100644 .github/workflows/DocumentationLinkCheck.yaml delete mode 100644 .github/workflows/InterfaceUpdateNotification.yaml delete mode 100644 .github/workflows/custom_spell.json diff --git a/.github/workflows/CheckAndCommentAction.yaml b/.github/workflows/CheckAndCommentAction.yaml deleted file mode 100644 index c86fd13228c..00000000000 --- a/.github/workflows/CheckAndCommentAction.yaml +++ /dev/null @@ -1,44 +0,0 @@ -name: CheckAndComment -on: - pull_request: - -jobs: - CheckFileChanged: - name: Check File Changed - runs-on: ubuntu-20.04 - outputs: - files_changed: ${{ steps.file_changes.outputs.files }} - steps: - - uses: actions/checkout@v2 - - id: file_changes - uses: trilom/file-changes-action@v1.2.3 - CheckBugPullRequest: - if: ${{ github.event.label.name == 'bug' }} - name: Check Bug Pull Request - runs-on: ubuntu-20.04 - needs: CheckFileChanged - steps: - - name: Check Release Note - if: contains(fromJson(needs.CheckFileChanged.outputs.files_changed), 'docs/ReleaseNotes.md') == false - uses: mshick/add-pr-comment@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - message: | - You labeld this PR as "bug", but Release Note does not updated, please check your PR. - allow-repeats: true - CheckFeaturePullRequest: - if: ${{ github.event.label.name == 'feature' }} - name: Check Feature Pull Request - runs-on: ubuntu-20.04 - needs: CheckFileChanged - steps: - - name: Check Release Note - if: contains(fromJson(needs.CheckFileChanged.outputs.files_changed), 'docs/ReleaseNotes.md') == false - uses: mshick/add-pr-comment@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - message: | - You labeld this PR as "feature", but Release Note does not updated, please check your PR. - allow-repeats: true diff --git a/.github/workflows/Docker.yaml b/.github/workflows/Docker.yaml deleted file mode 100644 index f476a722b9c..00000000000 --- a/.github/workflows/Docker.yaml +++ /dev/null @@ -1,47 +0,0 @@ -name: Docker - -on: - workflow_dispatch: - schedule: - - cron: 0 0 * * * - pull_request: - paths: - - '**' - - '!docs/**' - - '!README.md' - - '!.github/**' - - '.github/workflows/Docker.yaml' - - '!mkdocs.yml' - push: - branches: - - master - release: - types: [published] -jobs: - job1: - name: Build Docker Image - runs-on: ubuntu-20.04 - timeout-minutes: 180 - strategy: - matrix: - rosdistro: [humble] - steps: - - uses: actions/checkout@v3 - - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v3 - with: - tags: ghcr.io/${{ github.repository_owner }}/scenario_simulator_v2:${{ matrix.rosdistro }} - no-cache: true - build-args: ROS_DISTRO=${{ matrix.rosdistro }} - push: ${{ github.event_name != 'pull_request' }} diff --git a/.github/workflows/Documentation.yaml b/.github/workflows/Documentation.yaml deleted file mode 100644 index 2eca581e53d..00000000000 --- a/.github/workflows/Documentation.yaml +++ /dev/null @@ -1,71 +0,0 @@ -name: Documentation - -on: - workflow_dispatch: - schedule: - - cron: 0 0 * * * - push: - branches: - - master - pull_request: - branches: - - master - -jobs: - generate: - name: Generate Documentation - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v2-beta - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: run protoc-gen-doc - run: docker run --rm -v $(pwd)/simulation/simulation_interface/proto/:/protos -v $(pwd)/docs/proto_doc:/out pseudomuto/protoc-gen-doc --doc_opt=markdown,protobuf.md - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - uses: abatilo/actions-poetry@v2 - with: - poetry-version: "1.5.1" - - name: install - run: poetry install --no-interaction - - name: Generate documentation - run: poetry run mkdocs build - - name: Upload Artifact - uses: actions/upload-artifact@v2 - with: - name: site - path: site - retention-days: 1 - - name: Publish Documentation - if: ${{ github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'}} - uses: peaceiris/actions-gh-pages@v3 - with: - personal_token: ${{ secrets.BLOOM_GITHUB_TOKEN }} - publish_dir: site - keep_files: false - external_repository: tier4/scenario_simulator_v2-docs - generate_api_document: - name: Generate API documentation - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v2-beta - - name: Install doxygen - run: sudo apt install -y doxygen - - name: Build document - run: doxygen Doxyfile - - name: Upload Artifact - uses: actions/upload-artifact@v2 - with: - name: api_documentation_site - path: html - retention-days: 1 - - name: Publish Documentation - if: ${{ github.event_name == 'push' || github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'}} - uses: peaceiris/actions-gh-pages@v3 - with: - personal_token: ${{ secrets.BLOOM_GITHUB_TOKEN }} - publish_dir: html - keep_files: false - external_repository: tier4/scenario_simulator_v2-api-docs diff --git a/.github/workflows/DocumentationLinkCheck.yaml b/.github/workflows/DocumentationLinkCheck.yaml deleted file mode 100644 index d3b4a11600c..00000000000 --- a/.github/workflows/DocumentationLinkCheck.yaml +++ /dev/null @@ -1,23 +0,0 @@ -name: DocumentationLinkCheck - -on: - repository_dispatch: - workflow_dispatch: - schedule: - - cron: 0 0 * * * - pull_request: - -jobs: - linkChecker: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Link Checker - id: lychee - uses: lycheeverse/lychee-action@v1.5.0 - with: - fail: true - args: "--verbose --no-progress './**/*.md' './**/*.html' --timeout 1000 --max-concurrency 32 -T 1 --retry-wait-time 10" - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/InterfaceUpdateNotification.yaml b/.github/workflows/InterfaceUpdateNotification.yaml deleted file mode 100644 index f7b6fb746d7..00000000000 --- a/.github/workflows/InterfaceUpdateNotification.yaml +++ /dev/null @@ -1,29 +0,0 @@ -name: InterfaceUpdateNotification -on: - pull_request: - branches: - - master - paths: - - openscenario/openscenario_interpreter_msgs/msg/*.msg - - simulation/traffic_simulator_msgs/msg/*.msg - -jobs: - notify: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Add label - run: | - gh pr edit ${{ github.event.pull_request.number }} --add-label "interface breaking" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Add comment - run: | - gh pr comment "$PR_NUMBER" --edit-last --body "This PR may breaks the interface to external services! Please see https://tier4.atlassian.net/wiki/spaces/S/pages/1984987364" \ - || gh pr comment "$PR_NUMBER" --body "This PR may breaks the interface to external services! Please see https://tier4.atlassian.net/wiki/spaces/S/pages/1984987364" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PR_NUMBER: ${{ github.event.pull_request.number }} diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 20380450d94..b124d98612b 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -1,32 +1,20 @@ -# This file is automatically deployed from https://github.com/at-wat/.rospkg-assets. -# Please don't directly edit; update at-wat/.rospkg-assets instead. - name: Release on: - issues: - types: [opened, edited] + push: + branches: + - tmp/master jobs: - Release: - runs-on: ubuntu-latest - if: startsWith(github.event.issue.title, 'Release ') + job1: + name: Release + runs-on: ubuntu-22.04 + timeout-minutes: 180 steps: - name: checkout uses: actions/checkout@v2 - - name: create release - id: create_release - uses: at-wat/catkin-release-action@v1 - with: - issue_title: ${{ github.event.issue.title }} - git_user: Masaya Kataoka - git_email: ms.kataoka@gmail.com - github_token: ${{ secrets.GITHUB_TOKEN }} - - name: open pull-request - uses: repo-sync/pull-request@v2 - with: - source_branch: ${{ steps.create_release.outputs.created_branch }} - destination_branch: master - pr_title: Release ${{ steps.create_release.outputs.version}} - pr_body: close \#${{ github.event.issue.number }} - pr_assignee: ${{ github.actor }} - github_token: ${{ secrets.BLOOM_GITHUB_TOKEN }} + - name: + run: | + catkin_generate_changelog + catkin_tag_changelog --bump patch + catkin_package_version --bump patch + diff --git a/.github/workflows/custom_spell.json b/.github/workflows/custom_spell.json deleted file mode 100644 index 4e256b4ceb5..00000000000 --- a/.github/workflows/custom_spell.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "ignorePaths": [ - "*.drawio", - "*/**/CHANGELOG.rst", - "openscenario/openscenario_utility/openscenario_utility/resources/*.xsd" - ], - "words": [ - "ARGN", - "AUTORCC", - "Canonicalized", - "canonicalizing", - "classname", - "DBOOST", - "DBUILD", - "DWITH_INTEGRATION_TEST", - "Kataoka", - "Masaya", - "Mersenne", - "Monic", - "NSPACES", - "Petrich", - "PREDEF", - "TESTRANDOMIZER", - "Tschirnhaus", - "classname", - "denormalize", - "denormalized", - "engageable", - "euclidian", - "hakuturu", - "libunwind", - "npcs", - "okta", - "oktas", - "oneof", - "parametersetaction", - "piotr", - "pluggable", - "protos", - "pyproject", - "randomizer", - "randomizers", - "subspline", - "travelling" - ] -} From 1eafbd5f615ff4d44a045c4fad61ed34ad52ec9c Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 14:49:10 +0900 Subject: [PATCH 003/245] update Release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index b124d98612b..f02f0aa45a2 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -1,8 +1,10 @@ name: Release on: - push: + pull_request: branches: - tmp/master + types: + - closed jobs: job1: @@ -12,9 +14,21 @@ jobs: steps: - name: checkout uses: actions/checkout@v2 - - name: + - name: update patch version + if: github.event.label.name == 'bump patch' run: | catkin_generate_changelog catkin_tag_changelog --bump patch catkin_package_version --bump patch - + - name: update minor version + if: github.event.label.name == 'bump minor' + run: | + catkin_generate_changelog + catkin_tag_changelog --bump minor + catkin_package_version --bump minor + - name: update majar version + if: github.event.label.name == 'bump majar' + run: | + catkin_generate_changelog + catkin_tag_changelog --bump majar + catkin_package_version --bump majar \ No newline at end of file From f7de5737174700ced2b8371cff58fc8e1ae17260 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 14:51:49 +0900 Subject: [PATCH 004/245] add white line at EoF Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index f02f0aa45a2..2e04a6c6957 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -31,4 +31,4 @@ jobs: run: | catkin_generate_changelog catkin_tag_changelog --bump majar - catkin_package_version --bump majar \ No newline at end of file + catkin_package_version --bump majar From 4fe6402fdf8ab8b404d7f1faf85cc430d6398e9c Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 15:02:18 +0900 Subject: [PATCH 005/245] add Check label action Signed-off-by: Masaya Kataoka --- .github/workflows/CheckLabel.yaml | 20 ++++++++++++++++++++ .github/workflows/Release.yaml | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/CheckLabel.yaml diff --git a/.github/workflows/CheckLabel.yaml b/.github/workflows/CheckLabel.yaml new file mode 100644 index 00000000000..4e242ba5513 --- /dev/null +++ b/.github/workflows/CheckLabel.yaml @@ -0,0 +1,20 @@ +name: Release +on: + pull_request: + branches: + - tmp/master + +jobs: + check_label: + name: Release + runs-on: ubuntu-22.04 + timeout-minutes: 10 + steps: + - name: Check required label + if: | + (github.event.label.name == 'bump patch') || + (github.event.label.name == 'bump minor') || + (github.event.label.name == 'bump majar') + run: exit 0 + - name: Throw error + run: exit 1 \ No newline at end of file diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 2e04a6c6957..ca9c49269bb 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -7,10 +7,10 @@ on: - closed jobs: - job1: + release: name: Release runs-on: ubuntu-22.04 - timeout-minutes: 180 + timeout-minutes: 10 steps: - name: checkout uses: actions/checkout@v2 From 8af50c6ffba5df86ab84dd3f9739fddc00fb9337 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 15:03:06 +0900 Subject: [PATCH 006/245] rename action Signed-off-by: Masaya Kataoka --- .github/workflows/CheckLabel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CheckLabel.yaml b/.github/workflows/CheckLabel.yaml index 4e242ba5513..60593da96c6 100644 --- a/.github/workflows/CheckLabel.yaml +++ b/.github/workflows/CheckLabel.yaml @@ -6,7 +6,7 @@ on: jobs: check_label: - name: Release + name: Check Label runs-on: ubuntu-22.04 timeout-minutes: 10 steps: From 429aea828a7a646b8e7b756b98efb187db73377f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 15:06:31 +0900 Subject: [PATCH 007/245] modify check step Signed-off-by: Masaya Kataoka --- .github/workflows/CheckLabel.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CheckLabel.yaml b/.github/workflows/CheckLabel.yaml index 60593da96c6..d262883fc67 100644 --- a/.github/workflows/CheckLabel.yaml +++ b/.github/workflows/CheckLabel.yaml @@ -11,10 +11,13 @@ jobs: timeout-minutes: 10 steps: - name: Check required label - if: | - (github.event.label.name == 'bump patch') || - (github.event.label.name == 'bump minor') || - (github.event.label.name == 'bump majar') + if: github.event.label.name == 'bump patch' + run: exit 0 + - name: Check required label + if: github.event.label.name == 'bump minor' + run: exit 0 + - name: Check required label + if: github.event.label.name == 'bump majar' run: exit 0 - name: Throw error run: exit 1 \ No newline at end of file From 15f74207b7c32eb11fd3cee97492a964fb7d47c2 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 15:08:48 +0900 Subject: [PATCH 008/245] check label Signed-off-by: Masaya Kataoka --- .github/workflows/CheckLabel.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/CheckLabel.yaml b/.github/workflows/CheckLabel.yaml index d262883fc67..6280b9d3337 100644 --- a/.github/workflows/CheckLabel.yaml +++ b/.github/workflows/CheckLabel.yaml @@ -11,13 +11,7 @@ jobs: timeout-minutes: 10 steps: - name: Check required label - if: github.event.label.name == 'bump patch' - run: exit 0 - - name: Check required label - if: github.event.label.name == 'bump minor' - run: exit 0 - - name: Check required label - if: github.event.label.name == 'bump majar' + if: contains(github.event.pull_request.labels.*.name, 'bump') run: exit 0 - name: Throw error run: exit 1 \ No newline at end of file From 3e2fc21f2ecdb560594b6724658adf061ecc5173 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 15:09:22 +0900 Subject: [PATCH 009/245] rename function Signed-off-by: Masaya Kataoka --- .github/workflows/CheckLabel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CheckLabel.yaml b/.github/workflows/CheckLabel.yaml index 6280b9d3337..220e71637bb 100644 --- a/.github/workflows/CheckLabel.yaml +++ b/.github/workflows/CheckLabel.yaml @@ -1,4 +1,4 @@ -name: Release +name: CheckLabel on: pull_request: branches: From 6129b5ae74fdc513e7f4ab5da336adc063063ac7 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 15:12:25 +0900 Subject: [PATCH 010/245] modify check function Signed-off-by: Masaya Kataoka --- .github/workflows/CheckLabel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CheckLabel.yaml b/.github/workflows/CheckLabel.yaml index 220e71637bb..3698bec7e87 100644 --- a/.github/workflows/CheckLabel.yaml +++ b/.github/workflows/CheckLabel.yaml @@ -11,7 +11,7 @@ jobs: timeout-minutes: 10 steps: - name: Check required label - if: contains(github.event.pull_request.labels.*.name, 'bump') + if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: exit 0 - name: Throw error run: exit 1 \ No newline at end of file From 297178637afe526a73050c8bcf3f28c12a4db5b5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 15:14:34 +0900 Subject: [PATCH 011/245] fix label check action Signed-off-by: Masaya Kataoka --- .github/workflows/CheckLabel.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CheckLabel.yaml b/.github/workflows/CheckLabel.yaml index 3698bec7e87..66bf3074b97 100644 --- a/.github/workflows/CheckLabel.yaml +++ b/.github/workflows/CheckLabel.yaml @@ -11,7 +11,7 @@ jobs: timeout-minutes: 10 steps: - name: Check required label - if: contains(github.event.pull_request.labels.*.name, 'bump patch') - run: exit 0 - - name: Throw error - run: exit 1 \ No newline at end of file + if: (!contains(github.event.pull_request.labels.*.name, 'bump patch')) && + (!contains(github.event.pull_request.labels.*.name, 'bump minor')) && + (!contains(github.event.pull_request.labels.*.name, 'bump majar')) + run: exit 1 From 3e28104e192cf0cd22d5ec85560c256347a40ae6 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 15:15:29 +0900 Subject: [PATCH 012/245] empty commit Signed-off-by: Masaya Kataoka From 4671bfda4f2d8fb0643217515b8fcee8188d6715 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 28 Nov 2023 15:19:32 +0900 Subject: [PATCH 013/245] fix release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index ca9c49269bb..0dfd533e959 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -15,19 +15,19 @@ jobs: - name: checkout uses: actions/checkout@v2 - name: update patch version - if: github.event.label.name == 'bump patch' + if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | catkin_generate_changelog catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: update minor version - if: github.event.label.name == 'bump minor' + if: contains(github.event.pull_request.labels.*.name, 'bump minor') run: | catkin_generate_changelog catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: update majar version - if: github.event.label.name == 'bump majar' + if: contains(github.event.pull_request.labels.*.name, 'bump majar') run: | catkin_generate_changelog catkin_tag_changelog --bump majar From a9a1a5b47da9e2025bb03e826b7f23cf586a4227 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 14:43:01 +0900 Subject: [PATCH 014/245] update release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 0dfd533e959..c8b00ef88f5 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -14,6 +14,8 @@ jobs: steps: - name: checkout uses: actions/checkout@v2 + with: + ref: tmp/master - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | @@ -32,3 +34,11 @@ jobs: catkin_generate_changelog catkin_tag_changelog --bump majar catkin_package_version --bump majar + - name: commit changes + run: | + date > generated.txt + git config user.name "Release Bot" + git config user.email "action@github.com" + git add . + git commit -m "bump version of scenario_simulator_v2." + git push From 66f2db7889d1c194794a7167360966781ae6ac74 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 14:53:24 +0900 Subject: [PATCH 015/245] use ros container Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index c8b00ef88f5..41d22ddbfae 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -11,6 +11,7 @@ jobs: name: Release runs-on: ubuntu-22.04 timeout-minutes: 10 + container: ros:humble steps: - name: checkout uses: actions/checkout@v2 From 4e6a44a1a993a8324d83eeb1788824ef99896014 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 14:55:14 +0900 Subject: [PATCH 016/245] add install step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 41d22ddbfae..178f2458bbe 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -13,6 +13,8 @@ jobs: timeout-minutes: 10 container: ros:humble steps: + - name: install bloom + run: apt update && apt install python3-bloom - name: checkout uses: actions/checkout@v2 with: From 24db8efaa196ab205d0b780780c8864583762d97 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 14:56:50 +0900 Subject: [PATCH 017/245] emtpy commit Signed-off-by: Masaya Kataoka From 5ef909b89a0d23532685e6bcea299e84d6618730 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 14:59:15 +0900 Subject: [PATCH 018/245] add -y option Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 178f2458bbe..7a1263f61fe 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -14,7 +14,7 @@ jobs: container: ros:humble steps: - name: install bloom - run: apt update && apt install python3-bloom + run: apt update && apt install -y python3-bloom - name: checkout uses: actions/checkout@v2 with: From cb688dfe22deceb243eb576e2c09f566542a537d Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 15:02:28 +0900 Subject: [PATCH 019/245] fix release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 7a1263f61fe..4f2dc978320 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -19,6 +19,10 @@ jobs: uses: actions/checkout@v2 with: ref: tmp/master + - name: Setup git user + run: | + git config user.name "Release Bot" + git config user.email "action@github.com" - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | @@ -39,9 +43,6 @@ jobs: catkin_package_version --bump majar - name: commit changes run: | - date > generated.txt - git config user.name "Release Bot" - git config user.email "action@github.com" git add . git commit -m "bump version of scenario_simulator_v2." git push From 50ff969ba69d0c2964d5f12dba8fbbe020c2106d Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 15:16:04 +0900 Subject: [PATCH 020/245] install git Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 4f2dc978320..c0cc9217944 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -14,7 +14,7 @@ jobs: container: ros:humble steps: - name: install bloom - run: apt update && apt install -y python3-bloom + run: apt update && apt install -y python3-bloom git - name: checkout uses: actions/checkout@v2 with: From 5b98b566e20a0909957141f2bbfab2516864abbe Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 15:22:53 +0900 Subject: [PATCH 021/245] add working directory Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index c0cc9217944..5d327c6abb8 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -23,26 +23,31 @@ jobs: run: | git config user.name "Release Bot" git config user.email "action@github.com" + working-directory: scenario_simulator_v2 - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | catkin_generate_changelog catkin_tag_changelog --bump patch catkin_package_version --bump patch + working-directory: scenario_simulator_v2 - name: update minor version if: contains(github.event.pull_request.labels.*.name, 'bump minor') run: | catkin_generate_changelog catkin_tag_changelog --bump minor catkin_package_version --bump minor + working-directory: scenario_simulator_v2 - name: update majar version if: contains(github.event.pull_request.labels.*.name, 'bump majar') run: | catkin_generate_changelog catkin_tag_changelog --bump majar catkin_package_version --bump majar + working-directory: scenario_simulator_v2 - name: commit changes run: | git add . git commit -m "bump version of scenario_simulator_v2." git push + working-directory: scenario_simulator_v2 From 0bf393d5ea92216cc2ee27e1c303cd2cd6a43ce5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 15:25:54 +0900 Subject: [PATCH 022/245] modify release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 5d327c6abb8..cde2eccc2c7 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -3,8 +3,8 @@ on: pull_request: branches: - tmp/master - types: - - closed + # types: + # - closed jobs: release: @@ -19,6 +19,7 @@ jobs: uses: actions/checkout@v2 with: ref: tmp/master + - run: ls - name: Setup git user run: | git config user.name "Release Bot" @@ -45,9 +46,9 @@ jobs: catkin_tag_changelog --bump majar catkin_package_version --bump majar working-directory: scenario_simulator_v2 - - name: commit changes - run: | - git add . - git commit -m "bump version of scenario_simulator_v2." - git push - working-directory: scenario_simulator_v2 + # - name: commit changes + # run: | + # git add . + # git commit -m "bump version of scenario_simulator_v2." + # git push + # working-directory: scenario_simulator_v2 From 248ee3b82a27b9b857258556d3f2e5097720f209 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 15:31:49 +0900 Subject: [PATCH 023/245] remove working directory Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index cde2eccc2c7..7d8a78cdfc8 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -24,28 +24,24 @@ jobs: run: | git config user.name "Release Bot" git config user.email "action@github.com" - working-directory: scenario_simulator_v2 - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | catkin_generate_changelog catkin_tag_changelog --bump patch catkin_package_version --bump patch - working-directory: scenario_simulator_v2 - name: update minor version if: contains(github.event.pull_request.labels.*.name, 'bump minor') run: | catkin_generate_changelog catkin_tag_changelog --bump minor catkin_package_version --bump minor - working-directory: scenario_simulator_v2 - name: update majar version if: contains(github.event.pull_request.labels.*.name, 'bump majar') run: | catkin_generate_changelog catkin_tag_changelog --bump majar catkin_package_version --bump majar - working-directory: scenario_simulator_v2 # - name: commit changes # run: | # git add . From 329092114a2cda1777fb3bb1df8fa9898e916a8d Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 15:36:16 +0900 Subject: [PATCH 024/245] use ls -a Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 7d8a78cdfc8..2fb6477e04e 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -19,7 +19,7 @@ jobs: uses: actions/checkout@v2 with: ref: tmp/master - - run: ls + - run: ls -a - name: Setup git user run: | git config user.name "Release Bot" From 00d2dd01eb143e2169e9bc1d83772cbeb7385e90 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 15:46:07 +0900 Subject: [PATCH 025/245] add --global Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 2fb6477e04e..5a7abf65768 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -22,8 +22,8 @@ jobs: - run: ls -a - name: Setup git user run: | - git config user.name "Release Bot" - git config user.email "action@github.com" + git config --global user.name "Release Bot" + git config --global user.email "action@github.com" - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | From 499faefcfd5a0c1c356d91dc3f8340b167e94305 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 15:53:14 +0900 Subject: [PATCH 026/245] add tmate step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 5a7abf65768..dbfb15940d9 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -36,6 +36,8 @@ jobs: catkin_generate_changelog catkin_tag_changelog --bump minor catkin_package_version --bump minor + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: update majar version if: contains(github.event.pull_request.labels.*.name, 'bump majar') run: | From 8d0baaa560ce4e213a5085b62f6eb1fe4ac0e6d3 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 15:54:28 +0900 Subject: [PATCH 027/245] modify release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index dbfb15940d9..0a6ad7bb0d2 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -24,6 +24,8 @@ jobs: run: | git config --global user.name "Release Bot" git config --global user.email "action@github.com" + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | @@ -36,8 +38,6 @@ jobs: catkin_generate_changelog catkin_tag_changelog --bump minor catkin_package_version --bump minor - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - name: update majar version if: contains(github.event.pull_request.labels.*.name, 'bump majar') run: | From 2e4c44d09dd357a294492b59bff3483997380799 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 15:59:09 +0900 Subject: [PATCH 028/245] modify release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 0a6ad7bb0d2..92ae1debfa7 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -24,24 +24,25 @@ jobs: run: | git config --global user.name "Release Bot" git config --global user.email "action@github.com" - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 + git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 + # - name: Setup tmate session + # uses: mxschmitt/action-tmate@v3 - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | - catkin_generate_changelog + catkin_generate_changelog -y --all catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: update minor version if: contains(github.event.pull_request.labels.*.name, 'bump minor') run: | - catkin_generate_changelog + ccatkin_generate_changelog -y --all catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: update majar version if: contains(github.event.pull_request.labels.*.name, 'bump majar') run: | - catkin_generate_changelog + catkin_generate_changelog -y --all catkin_tag_changelog --bump majar catkin_package_version --bump majar # - name: commit changes From eadb800ec63b86f5ccf99e16d839f5834ce8a5d3 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 16:03:20 +0900 Subject: [PATCH 029/245] remove all option Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 92ae1debfa7..9a450f1a0ba 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -30,19 +30,19 @@ jobs: - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | - catkin_generate_changelog -y --all + catkin_generate_changelog -y catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: update minor version if: contains(github.event.pull_request.labels.*.name, 'bump minor') run: | - ccatkin_generate_changelog -y --all + ccatkin_generate_changelog -y catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: update majar version if: contains(github.event.pull_request.labels.*.name, 'bump majar') run: | - catkin_generate_changelog -y --all + catkin_generate_changelog -y catkin_tag_changelog --bump majar catkin_package_version --bump majar # - name: commit changes From aa5de36fff407fc72a04701ff11ec438d8eb8881 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 16:09:47 +0900 Subject: [PATCH 030/245] add tmate step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 9a450f1a0ba..8732865b539 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -25,8 +25,8 @@ jobs: git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - # - name: Setup tmate session - # uses: mxschmitt/action-tmate@v3 + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | From c0296fc0bc4c82c033f10b73274f0d41f54dcb6a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 16:15:54 +0900 Subject: [PATCH 031/245] modify release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 8732865b539..de601c089de 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -2,7 +2,7 @@ name: Release on: pull_request: branches: - - tmp/master + - master # types: # - closed @@ -18,15 +18,15 @@ jobs: - name: checkout uses: actions/checkout@v2 with: - ref: tmp/master + ref: master - run: ls -a - name: Setup git user run: | git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 + # - name: Setup tmate session + # uses: mxschmitt/action-tmate@v3 - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | From b9ec2cd91a0b9584df154bc349fad2f8edfb5267 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 29 Nov 2023 16:18:39 +0900 Subject: [PATCH 032/245] comment in push step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index de601c089de..34f9ecea8a5 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -3,8 +3,8 @@ on: pull_request: branches: - master - # types: - # - closed + types: + - closed jobs: release: @@ -45,9 +45,9 @@ jobs: catkin_generate_changelog -y catkin_tag_changelog --bump majar catkin_package_version --bump majar - # - name: commit changes - # run: | - # git add . - # git commit -m "bump version of scenario_simulator_v2." - # git push - # working-directory: scenario_simulator_v2 + - name: commit changes + run: | + git add . + git commit -m "bump version of scenario_simulator_v2." + git push + working-directory: scenario_simulator_v2 From 6aee24b6d480218fd390a50e767f1cdb109f12d0 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 5 Dec 2023 15:46:36 +0900 Subject: [PATCH 033/245] fix typo Signed-off-by: Masaya Kataoka --- .github/workflows/CheckLabel.yaml | 2 +- .github/workflows/Release.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CheckLabel.yaml b/.github/workflows/CheckLabel.yaml index 66bf3074b97..9bf70dc4f56 100644 --- a/.github/workflows/CheckLabel.yaml +++ b/.github/workflows/CheckLabel.yaml @@ -13,5 +13,5 @@ jobs: - name: Check required label if: (!contains(github.event.pull_request.labels.*.name, 'bump patch')) && (!contains(github.event.pull_request.labels.*.name, 'bump minor')) && - (!contains(github.event.pull_request.labels.*.name, 'bump majar')) + (!contains(github.event.pull_request.labels.*.name, 'bump major')) run: exit 1 diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 34f9ecea8a5..9443b19ccb2 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -36,15 +36,15 @@ jobs: - name: update minor version if: contains(github.event.pull_request.labels.*.name, 'bump minor') run: | - ccatkin_generate_changelog -y + catkin_generate_changelog -y catkin_tag_changelog --bump minor catkin_package_version --bump minor - - name: update majar version - if: contains(github.event.pull_request.labels.*.name, 'bump majar') + - name: update major version + if: contains(github.event.pull_request.labels.*.name, 'bump major') run: | catkin_generate_changelog -y - catkin_tag_changelog --bump majar - catkin_package_version --bump majar + catkin_tag_changelog --bump major + catkin_package_version --bump major - name: commit changes run: | git add . From 86f2198a9d54efd85a8216bd64d7887facbadbe2 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 5 Dec 2023 16:25:48 +0900 Subject: [PATCH 034/245] update release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 9443b19ccb2..d970b060133 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -50,4 +50,6 @@ jobs: git add . git commit -m "bump version of scenario_simulator_v2." git push + git tag -a $(catkin_package_version) -m "release $(catkin_package_version)" + git push origin $(catkin_package_version) working-directory: scenario_simulator_v2 From 46c8c1719ac5238eeae682430816cb5448522a72 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 5 Dec 2023 16:32:34 +0900 Subject: [PATCH 035/245] add git pull step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index d970b060133..72cd18dc8a9 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -30,18 +30,21 @@ jobs: - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | + git pull --tags catkin_generate_changelog -y catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: update minor version if: contains(github.event.pull_request.labels.*.name, 'bump minor') run: | + git pull --tags catkin_generate_changelog -y catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: update major version if: contains(github.event.pull_request.labels.*.name, 'bump major') run: | + git pull --tags catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major From 28306f4478ec343ae60d603058d4737ece5a3af3 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 5 Dec 2023 16:40:03 +0900 Subject: [PATCH 036/245] add white line at EoF Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 72cd18dc8a9..79313ffa728 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -56,3 +56,4 @@ jobs: git tag -a $(catkin_package_version) -m "release $(catkin_package_version)" git push origin $(catkin_package_version) working-directory: scenario_simulator_v2 + From 71e3ff2c8efcf8473ed82a3c9958decb223f1f22 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 5 Dec 2023 16:40:36 +0900 Subject: [PATCH 037/245] fix check label action Signed-off-by: Masaya Kataoka --- .github/workflows/CheckLabel.yaml | 2 +- .github/workflows/Release.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/CheckLabel.yaml b/.github/workflows/CheckLabel.yaml index 9bf70dc4f56..428b0a072c1 100644 --- a/.github/workflows/CheckLabel.yaml +++ b/.github/workflows/CheckLabel.yaml @@ -2,7 +2,7 @@ name: CheckLabel on: pull_request: branches: - - tmp/master + - master jobs: check_label: diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 79313ffa728..72cd18dc8a9 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -56,4 +56,3 @@ jobs: git tag -a $(catkin_package_version) -m "release $(catkin_package_version)" git push origin $(catkin_package_version) working-directory: scenario_simulator_v2 - From a28078bb87050085021635f191ead752b1d496b7 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 5 Dec 2023 16:43:41 +0900 Subject: [PATCH 038/245] modify trigger Signed-off-by: Masaya Kataoka --- .github/workflows/CheckLabel.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/CheckLabel.yaml b/.github/workflows/CheckLabel.yaml index 428b0a072c1..6c562d59483 100644 --- a/.github/workflows/CheckLabel.yaml +++ b/.github/workflows/CheckLabel.yaml @@ -3,6 +3,10 @@ on: pull_request: branches: - master + label: + types: + - created + - edited jobs: check_label: From 5e9f49f150d14955d348391e82772245a34b2c0f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 5 Dec 2023 16:56:53 +0900 Subject: [PATCH 039/245] clone commit history Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 72cd18dc8a9..e77dc920102 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -19,6 +19,8 @@ jobs: uses: actions/checkout@v2 with: ref: master + fetch-depth: 0 + fetch-tags: true - run: ls -a - name: Setup git user run: | @@ -30,21 +32,18 @@ jobs: - name: update patch version if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | - git pull --tags catkin_generate_changelog -y catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: update minor version if: contains(github.event.pull_request.labels.*.name, 'bump minor') run: | - git pull --tags catkin_generate_changelog -y catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: update major version if: contains(github.event.pull_request.labels.*.name, 'bump major') run: | - git pull --tags catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major From 88bf7a7092e79903ad559f3c9e522eb153fd9934 Mon Sep 17 00:00:00 2001 From: Release Bot Date: Tue, 5 Dec 2023 08:03:57 +0000 Subject: [PATCH 040/245] bump version of scenario_simulator_v2. --- scenario_simulator_v2/CHANGELOG.rst | 23 +++++++++++++++++++++-- scenario_simulator_v2/package.xml | 2 +- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 9aceaa9dc88..32c1a85b78a 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,8 +2,27 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2023-12-05) +------------------ +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + * Merge branch 'master' into feature/freespace-distance-condition * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection * Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c49ab6f3033..c456a27a948 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.0 + 0.8.1 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 From aacece880496ebd53d5a3d691b5b33acd3a7abdf Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 8 Dec 2023 16:11:09 +0900 Subject: [PATCH 041/245] enable testing new release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index e77dc920102..bd35dc599ef 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -1,10 +1,6 @@ name: Release on: - pull_request: - branches: - - master - types: - - closed + merge_group: jobs: release: @@ -50,8 +46,9 @@ jobs: - name: commit changes run: | git add . - git commit -m "bump version of scenario_simulator_v2." + git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" git push git tag -a $(catkin_package_version) -m "release $(catkin_package_version)" git push origin $(catkin_package_version) working-directory: scenario_simulator_v2 + From f547c898f50b4f5a9ccf962e9e61689b918a6352 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 8 Dec 2023 16:15:16 +0900 Subject: [PATCH 042/245] remove unused function Signed-off-by: Masaya Kataoka --- .github/workflows/BuildAndRun.yaml | 102 ------------------ .../workflows/SimModelUpdateNotification.yaml | 22 ---- .github/workflows/SpellCheck.yaml | 23 ---- .github/workflows/SpellCheckAll.yaml | 24 ----- .github/workflows/SyncReleaseNote.yaml | 19 ---- .github/workflows/ToolDispatch.yaml | 19 ---- 6 files changed, 209 deletions(-) delete mode 100644 .github/workflows/BuildAndRun.yaml delete mode 100644 .github/workflows/SimModelUpdateNotification.yaml delete mode 100644 .github/workflows/SpellCheck.yaml delete mode 100644 .github/workflows/SpellCheckAll.yaml delete mode 100644 .github/workflows/SyncReleaseNote.yaml delete mode 100644 .github/workflows/ToolDispatch.yaml diff --git a/.github/workflows/BuildAndRun.yaml b/.github/workflows/BuildAndRun.yaml deleted file mode 100644 index 72cc378c8a5..00000000000 --- a/.github/workflows/BuildAndRun.yaml +++ /dev/null @@ -1,102 +0,0 @@ -name: BuildAndRun - -on: - workflow_dispatch: - schedule: - - cron: 0 0 * * * - pull_request: - paths: - - '**' - - '!docs/**' - - '!README.md' - - '!.github/**' - - '.github/workflows/BuildAndRun.yaml' - - '!mkdocs.yml' - - '!pyproject.toml' - - '!poetry.lock' - push: - branches: - - master -jobs: - job1: - name: BuildAndRun - runs-on: ubuntu-22.04 - timeout-minutes: 180 - container: ros:${{ matrix.rosdistro }} - env: - DEBIAN_FRONTEND: noninteractive - strategy: - fail-fast: false - matrix: - rosdistro: [humble] - steps: - - name: suppress warnings - run: | - git config --global --add safe.directory '*' - - - uses: actions/checkout@v2-beta - with: - fetch-depth: 0 - token: ${{ secrets.GITHUB_TOKEN }} - - - name: Search packages in this repository - id: list_packages - run: | - echo package_list=$(colcon list --names-only | sed -e ':loop; N; $!b loop; s/\n/ /g') >> $GITHUB_OUTPUT - - - 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: 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-get 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: 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: Scenario test - run: | - source ~/ros2_ws/install/setup.bash - cd ~/ros2_ws - source 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 diff --git a/.github/workflows/SimModelUpdateNotification.yaml b/.github/workflows/SimModelUpdateNotification.yaml deleted file mode 100644 index 4467d60703e..00000000000 --- a/.github/workflows/SimModelUpdateNotification.yaml +++ /dev/null @@ -1,22 +0,0 @@ -name: SimModelUpdateNotification -on: - pull_request: - paths: - - simulation/simple_sensor_simulator/include/simple_sensor_simulator/vehicle_simulation/vehicle_model/**.hpp - - simulation/simple_sensor_simulator/src/vehicle_simulation/vehicle_model/**.cpp - -jobs: - notify: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Add comment - run: | - gh pr comment "$PR_NUMBER" --edit-last --body "This PR edits vehicle model that is copied from [simple_planning_simulator](https://github.com/autowarefoundation/autoware.universe/tree/main/simulator/simple_planning_simulator). Please consider making changes to the original code to avoid confusion or consult developers (@hakuturu583, @yamacir-kit and @HansRobo )." \ - || gh pr comment "$PR_NUMBER" --body "This PR edits vehicle model that is copied from [simple_planning_simulator](https://github.com/autowarefoundation/autoware.universe/tree/main/simulator/simple_planning_simulator). Please consider making changes to the original code to avoid confusion or consult developers (@hakuturu583, @yamacir-kit and @HansRobo )." - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PR_NUMBER: ${{ github.event.pull_request.number }} diff --git a/.github/workflows/SpellCheck.yaml b/.github/workflows/SpellCheck.yaml deleted file mode 100644 index 9dcd8b91b58..00000000000 --- a/.github/workflows/SpellCheck.yaml +++ /dev/null @@ -1,23 +0,0 @@ -name: SpellCheck - -on: - workflow_dispatch: - pull_request: - branches: - - master - -jobs: - spell-check: - runs-on: ubuntu-latest - steps: - - name: Check out repository - uses: actions/checkout@v3 - - - name: Run spell-check - uses: autowarefoundation/autoware-github-actions/spell-check@v1 - with: - cspell-json-url: https://raw.githubusercontent.com/tier4/autoware-spell-check-dict/main/.cspell.json - local-cspell-json: .github/workflows/custom_spell.json - dict-packages: | - https://github.com/tier4/cspell-dicts - verbose: true diff --git a/.github/workflows/SpellCheckAll.yaml b/.github/workflows/SpellCheckAll.yaml deleted file mode 100644 index 361d474bf44..00000000000 --- a/.github/workflows/SpellCheckAll.yaml +++ /dev/null @@ -1,24 +0,0 @@ -name: SpellCheckAll - -on: - workflow_dispatch: - pull_request: - branches: - - master - -jobs: - spell-check: - runs-on: ubuntu-latest - steps: - - name: Check out repository - uses: actions/checkout@v3 - - - name: Run spell-check - uses: autowarefoundation/autoware-github-actions/spell-check@v1 - with: - cspell-json-url: https://raw.githubusercontent.com/tier4/autoware-spell-check-dict/main/.cspell.json - local-cspell-json: .github/workflows/custom_spell.json - dict-packages: | - https://github.com/tier4/cspell-dicts - incremental-files-only: false - verbose: true diff --git a/.github/workflows/SyncReleaseNote.yaml b/.github/workflows/SyncReleaseNote.yaml deleted file mode 100644 index 449bff61abd..00000000000 --- a/.github/workflows/SyncReleaseNote.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: SyncReleaseNote -on: - workflow_dispatch: - push: - branches: - - master - -jobs: - dev: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: cupcakearmy/confluence-markdown-sync@v1.0.1 - with: - from: './docs/ReleaseNotes.md' - to: '2508390892' - cloud: tier4 - user: kotaro.yoshimoto@tier4.jp - token: ${{ secrets.CONFLUENCE_TOKEN }} diff --git a/.github/workflows/ToolDispatch.yaml b/.github/workflows/ToolDispatch.yaml deleted file mode 100644 index 2f7e8f67571..00000000000 --- a/.github/workflows/ToolDispatch.yaml +++ /dev/null @@ -1,19 +0,0 @@ -name: ToolDispatch -on: - pull_request: - types: [labeled] - -jobs: - make_dispatch_event: - runs-on: ubuntu-latest - if: github.event.label.name == 'wait for regression test' - steps: - - name: trigger - run: | - curl \ - -X POST \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer ${{ secrets.GH_PAT }}"\ - -H "X-GitHub-Api-Version: 2022-11-28" \ - https://api.github.com/repos/tier4/sim_evaluation_tools/dispatches \ - -d '{"event_type":"pull_request_notification","client_payload":{"branch_name":"${{ github.event.pull_request.head.ref }}","pr_number":"${{ github.event.pull_request.number }}"}}' From 05d0cc6b71b5ebd25682c91a67fa370de32b4af5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 8 Dec 2023 16:27:00 +0900 Subject: [PATCH 043/245] modify release Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index bd35dc599ef..571125d8f7b 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -51,4 +51,3 @@ jobs: git tag -a $(catkin_package_version) -m "release $(catkin_package_version)" git push origin $(catkin_package_version) working-directory: scenario_simulator_v2 - From 3e969cd828c6a16b28da0d0d717039d810b4031f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 8 Dec 2023 16:35:22 +0900 Subject: [PATCH 044/245] modify trigger Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 571125d8f7b..74fba9cdf1c 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -1,6 +1,7 @@ name: Release on: merge_group: + types: [checks_requested] jobs: release: From 095e4fd25dd1cd3a042deda38b403323251f7529 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 12 Dec 2023 14:29:22 +0900 Subject: [PATCH 045/245] add workflow dispatch event Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 74fba9cdf1c..1201e921400 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -2,6 +2,7 @@ name: Release on: merge_group: types: [checks_requested] + workflow_dispatch: jobs: release: From a7771a24fa71c976c39c60a9349f729da26c5566 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 12 Dec 2023 14:33:12 +0900 Subject: [PATCH 046/245] remove workflow-dispatch Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 1201e921400..9be31d5bd76 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -2,8 +2,7 @@ name: Release on: merge_group: types: [checks_requested] - workflow_dispatch: - + jobs: release: name: Release From d180af6e402c1bbfe8247a537105f0cac12f5f9a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 12 Dec 2023 14:35:39 +0900 Subject: [PATCH 047/245] add empty file (test commit) Signed-off-by: Masaya Kataoka --- hoge.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 hoge.txt diff --git a/hoge.txt b/hoge.txt new file mode 100644 index 00000000000..e69de29bb2d From 83fcfe85f1c896febfe7d4dc0b59dc76ad3c3346 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 14 Dec 2023 17:46:28 +0900 Subject: [PATCH 048/245] update CHANGELOG Signed-off-by: Masaya Kataoka --- scenario_simulator_v2/CHANGELOG.rst | 4 ++-- scenario_simulator_v2/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 32c1a85b78a..2148962eb5c 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -0.8.1 (2023-12-05) ------------------- +Forthcoming +----------- * Merge pull request `#10 `_ from hakuturu583/test/release update CHANGELOG * update CHANGELOG diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c456a27a948..c49ab6f3033 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.1 + 0.8.0 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 From d7c93ba3f027d8fad7b61ff06991c04e88693d9e Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 16:26:34 +0900 Subject: [PATCH 049/245] add save labels as cache action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 30 ++++++++++------------- .github/workflows/SaveLabelAsCache.yaml | 32 +++++++++++++++++++++++++ .gitignore | 3 +++ 3 files changed, 47 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/SaveLabelAsCache.yaml diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 9be31d5bd76..6454ade6013 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -24,26 +24,20 @@ jobs: git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - # - name: Setup tmate session - # uses: mxschmitt/action-tmate@v3 - - name: update patch version - if: contains(github.event.pull_request.labels.*.name, 'bump patch') - run: | - catkin_generate_changelog -y - catkin_tag_changelog --bump patch - catkin_package_version --bump patch - - name: update minor version - if: contains(github.event.pull_request.labels.*.name, 'bump minor') - run: | - catkin_generate_changelog -y - catkin_tag_changelog --bump minor - catkin_package_version --bump minor - - name: update major version - if: contains(github.event.pull_request.labels.*.name, 'bump major') + + - name: Restore labels from cache + uses: actions/cache@v4 + with: + path: semantic_version_bump.txt + key: label-${{ github.event.merge_group.head_ref }} + fail-on-cache-miss: true + + - name: bump version run: | catkin_generate_changelog -y - catkin_tag_changelog --bump major - catkin_package_version --bump major + catkin_tag_changelog --bump $(cat semantic_version_bump.txt) + catkin_package_version --bump $(cat semantic_version_bump.txt) + - name: commit changes run: | git add . diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml new file mode 100644 index 00000000000..472ea064197 --- /dev/null +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -0,0 +1,32 @@ +name: SaveLabelAsCache + +on: + pull_request: + branches: + - master + types: + - closed + +jobs: + save_label_as_cache: + name: SaveLabelAsCache + runs-on: ubuntu-22.04 + timeout-minutes: 10 + steps: + - name: is_bump_patch + if: contains(github.event.pull_request.labels.*.name, 'bump patch') + run: | + echo patch > semantic_version_bump.txt + - name: is_bump_minor + if: contains(github.event.pull_request.labels.*.name, 'bump minor') + run: | + echo minor > semantic_version_bump.txt + - name: is_bump_major + if: contains(github.event.pull_request.labels.*.name, 'bump major') + run: | + echo major > semantic_version_bump.txt + - name: Cache label + uses: actions/cache@v4 + with: + path: semantic_version_bump.txt + key: label-${{ github.ref }} diff --git a/.gitignore b/.gitignore index 665a3b4b50c..f5b02c3f760 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,9 @@ # other settings .vscode +# version control +semantic_version_bump.txt + # backup file *.bak From f4b3afed9b81f478c3337306c9db0acccc0680d5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 16:29:26 +0900 Subject: [PATCH 050/245] remove hoge.txt Signed-off-by: Masaya Kataoka --- hoge.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 hoge.txt diff --git a/hoge.txt b/hoge.txt deleted file mode 100644 index e69de29bb2d..00000000000 From ca5f5486fddb2d3366ddbc7c51b05cbfd4a942e2 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 16:43:12 +0900 Subject: [PATCH 051/245] add trigger Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 6454ade6013..0e37fb6c9d0 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -1,5 +1,6 @@ name: Release on: + pull_request: merge_group: types: [checks_requested] @@ -11,21 +12,26 @@ jobs: container: ros:humble steps: - name: install bloom + if: ${{ github.event_name != 'pull_request' }} run: apt update && apt install -y python3-bloom git + - name: checkout + if: ${{ github.event_name != 'pull_request' }} uses: actions/checkout@v2 with: ref: master fetch-depth: 0 fetch-tags: true - - run: ls -a + - name: Setup git user + if: ${{ github.event_name != 'pull_request' }} run: | git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - name: Restore labels from cache + if: ${{ github.event_name != 'pull_request' }} uses: actions/cache@v4 with: path: semantic_version_bump.txt @@ -33,12 +39,14 @@ jobs: fail-on-cache-miss: true - name: bump version + if: ${{ github.event_name != 'pull_request' }} run: | catkin_generate_changelog -y catkin_tag_changelog --bump $(cat semantic_version_bump.txt) catkin_package_version --bump $(cat semantic_version_bump.txt) - name: commit changes + if: ${{ github.event_name != 'pull_request' }} run: | git add . git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" From 30873807344b91f67f3402d2e575da9eaf74a169 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 16:44:42 +0900 Subject: [PATCH 052/245] empty commit From 7a39b9ef3a5149c6cbe92b84cdc894ba3a4049d9 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 16:47:26 +0900 Subject: [PATCH 053/245] configure trigger Signed-off-by: Masaya Kataoka --- .github/workflows/SaveLabelAsCache.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml index 472ea064197..f123287f126 100644 --- a/.github/workflows/SaveLabelAsCache.yaml +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -4,8 +4,6 @@ on: pull_request: branches: - master - types: - - closed jobs: save_label_as_cache: From aaa4726ff58d6ac55c5f41b0af5d130ba5b8dfc0 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 16:52:05 +0900 Subject: [PATCH 054/245] Update SaveLabelAsCache.yaml --- .github/workflows/SaveLabelAsCache.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml index 472ea064197..f123287f126 100644 --- a/.github/workflows/SaveLabelAsCache.yaml +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -4,8 +4,6 @@ on: pull_request: branches: - master - types: - - closed jobs: save_label_as_cache: From 9cbb0654ce73467f08cd7d501fad9b97d9db99f1 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 16:52:52 +0900 Subject: [PATCH 055/245] empty commit Signed-off-by: Masaya Kataoka From b72806886ced9e1c321ae9f4cf45514f74863cac Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 17:03:47 +0900 Subject: [PATCH 056/245] use sha hash Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- .github/workflows/SaveLabelAsCache.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 0e37fb6c9d0..0c8deee6cb5 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -35,7 +35,7 @@ jobs: uses: actions/cache@v4 with: path: semantic_version_bump.txt - key: label-${{ github.event.merge_group.head_ref }} + key: label-${{ github.event.merge_group.head_commit.id }} fail-on-cache-miss: true - name: bump version diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml index f123287f126..ccbe083835b 100644 --- a/.github/workflows/SaveLabelAsCache.yaml +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -27,4 +27,4 @@ jobs: uses: actions/cache@v4 with: path: semantic_version_bump.txt - key: label-${{ github.ref }} + key: label-${{ github.event.pull_request.head.sha }} From 11278f28bae4d101e052a9e63dfbc0183b6585b5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 17:08:33 +0900 Subject: [PATCH 057/245] use git command Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 0c8deee6cb5..2242647caa8 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -35,7 +35,7 @@ jobs: uses: actions/cache@v4 with: path: semantic_version_bump.txt - key: label-${{ github.event.merge_group.head_commit.id }} + key: label-$(git show --format='%H' --no-patch) fail-on-cache-miss: true - name: bump version From 63f0a933cfe315c14c0064af4a30c1a77d4dfe1b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 17:16:47 +0900 Subject: [PATCH 058/245] add get restore key step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 2242647caa8..efcbbb969db 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -30,12 +30,19 @@ jobs: git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 + - name: Get restore key + if: ${{ github.event_name != 'pull_request' }} + run: | + label='label-$(git show --format='%H' --no-patch)' + echo "::set-output name=restore_key::${label}" + id: get_restore_key + - name: Restore labels from cache if: ${{ github.event_name != 'pull_request' }} uses: actions/cache@v4 with: path: semantic_version_bump.txt - key: label-$(git show --format='%H' --no-patch) + key: ${{ steps.get_restore_key.outputs.restore_key }} fail-on-cache-miss: true - name: bump version From ed4c0fd2e5cfed5b27166eee8b2aa06cf3f1ec31 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 17:23:16 +0900 Subject: [PATCH 059/245] use GITHUB_OUTPUT Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index efcbbb969db..919fe837c48 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -32,9 +32,7 @@ jobs: - name: Get restore key if: ${{ github.event_name != 'pull_request' }} - run: | - label='label-$(git show --format='%H' --no-patch)' - echo "::set-output name=restore_key::${label}" + run: echo "restore_key=label-$(git show --format='%H' --no-patch)" >> $GITHUB_OUTPUT id: get_restore_key - name: Restore labels from cache From 20296e301b8390e14e51f3b12be642cd3798aac1 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 17:26:17 +0900 Subject: [PATCH 060/245] remove ref in checkout Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 919fe837c48..06c8f6241ff 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -19,7 +19,6 @@ jobs: if: ${{ github.event_name != 'pull_request' }} uses: actions/checkout@v2 with: - ref: master fetch-depth: 0 fetch-tags: true From f6ca35863019b4060812d7e581788291a4999d44 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 17:43:35 +0900 Subject: [PATCH 061/245] use head commit Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 06c8f6241ff..9b847ef9e68 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -19,6 +19,7 @@ jobs: if: ${{ github.event_name != 'pull_request' }} uses: actions/checkout@v2 with: + ref: master fetch-depth: 0 fetch-tags: true @@ -29,17 +30,20 @@ jobs: git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - - name: Get restore key - if: ${{ github.event_name != 'pull_request' }} - run: echo "restore_key=label-$(git show --format='%H' --no-patch)" >> $GITHUB_OUTPUT - id: get_restore_key + # - name: Get restore key + # if: ${{ github.event_name != 'pull_request' }} + # run: echo "restore_key=label-$(git show --format='%H' --no-patch)" >> $GITHUB_OUTPUT + # id: get_restore_key + - name: Debug + run: echo ${{ github.event.pull_request.head_commit }} - name: Restore labels from cache if: ${{ github.event_name != 'pull_request' }} uses: actions/cache@v4 with: path: semantic_version_bump.txt - key: ${{ steps.get_restore_key.outputs.restore_key }} + key: ${{ github.event.pull_request.head_commit.id }} + # key: ${{ steps.get_restore_key.outputs.restore_key }} fail-on-cache-miss: true - name: bump version From 98bcabd264eebac1dcac0e656d5ffae7e25fd8ce Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 17:48:08 +0900 Subject: [PATCH 062/245] fix workflow Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 9b847ef9e68..fc7307077a4 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -35,14 +35,14 @@ jobs: # run: echo "restore_key=label-$(git show --format='%H' --no-patch)" >> $GITHUB_OUTPUT # id: get_restore_key - name: Debug - run: echo ${{ github.event.pull_request.head_commit }} + run: echo ${{ github.event.merge_group.head_commit }} - name: Restore labels from cache if: ${{ github.event_name != 'pull_request' }} uses: actions/cache@v4 with: path: semantic_version_bump.txt - key: ${{ github.event.pull_request.head_commit.id }} + key: ${{ github.event.merge_group.head_commit.id }} # key: ${{ steps.get_restore_key.outputs.restore_key }} fail-on-cache-miss: true From 78be9be5f3ab80f8d90f318817aca778e8b21b28 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 17:56:18 +0900 Subject: [PATCH 063/245] add debug step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index fc7307077a4..fe3cb6e88b0 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -35,7 +35,7 @@ jobs: # run: echo "restore_key=label-$(git show --format='%H' --no-patch)" >> $GITHUB_OUTPUT # id: get_restore_key - name: Debug - run: echo ${{ github.event.merge_group.head_commit }} + run: echo '${{ toJSON(github) }}' - name: Restore labels from cache if: ${{ github.event_name != 'pull_request' }} From 06c8c351edcf8d698e02a6ad952b65157c688d3a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 18:32:50 +0900 Subject: [PATCH 064/245] update release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index fe3cb6e88b0..75b89c58d8a 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -35,14 +35,22 @@ jobs: # run: echo "restore_key=label-$(git show --format='%H' --no-patch)" >> $GITHUB_OUTPUT # id: get_restore_key - name: Debug + if: ${{ github.event_name != 'pull_request' }} run: echo '${{ toJSON(github) }}' + - uses: KyoriPowered/action-regex-match@v3 + if: ${{ github.event_name != 'pull_request' }} + id: regex-match + with: + text: ${{ github.event.merge_group.ref }} + regex: 'master/pr-([0-9]+)' + - name: Restore labels from cache if: ${{ github.event_name != 'pull_request' }} uses: actions/cache@v4 with: path: semantic_version_bump.txt - key: ${{ github.event.merge_group.head_commit.id }} + key: ${{ steps.regex-match.outputs.group1 }} # key: ${{ steps.get_restore_key.outputs.restore_key }} fail-on-cache-miss: true From 00f112ddfaabed1ca739a178187b034459b3433d Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 18:39:53 +0900 Subject: [PATCH 065/245] fix input text Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 75b89c58d8a..38a262f518f 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -36,13 +36,13 @@ jobs: # id: get_restore_key - name: Debug if: ${{ github.event_name != 'pull_request' }} - run: echo '${{ toJSON(github) }}' + run: echo '${{ toJSON(github.event.merge_group) }}' - uses: KyoriPowered/action-regex-match@v3 if: ${{ github.event_name != 'pull_request' }} id: regex-match with: - text: ${{ github.event.merge_group.ref }} + text: ${{ github.event.merge_group.head_ref }} regex: 'master/pr-([0-9]+)' - name: Restore labels from cache From 59f5eb16edd7e8ccf23de39de6d09caaf385edb3 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 18:45:02 +0900 Subject: [PATCH 066/245] add debug step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 38a262f518f..db45d3a5427 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -30,13 +30,8 @@ jobs: git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - # - name: Get restore key - # if: ${{ github.event_name != 'pull_request' }} - # run: echo "restore_key=label-$(git show --format='%H' --no-patch)" >> $GITHUB_OUTPUT - # id: get_restore_key - - name: Debug - if: ${{ github.event_name != 'pull_request' }} - run: echo '${{ toJSON(github.event.merge_group) }}' + - name: debug + run: echo '${{ toJSON(github.event.pull_request) }}' - uses: KyoriPowered/action-regex-match@v3 if: ${{ github.event_name != 'pull_request' }} @@ -50,8 +45,7 @@ jobs: uses: actions/cache@v4 with: path: semantic_version_bump.txt - key: ${{ steps.regex-match.outputs.group1 }} - # key: ${{ steps.get_restore_key.outputs.restore_key }} + key: label-pr-${{ steps.regex-match.outputs.group1 }} fail-on-cache-miss: true - name: bump version From 90139d77ab3309e37dad0cf05c8d442b76cdf25d Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 18:57:36 +0900 Subject: [PATCH 067/245] add debug Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index db45d3a5427..5ec847f2ec4 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -31,11 +31,20 @@ jobs: git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - name: debug - run: echo '${{ toJSON(github.event.pull_request) }}' + run: echo '${{ toJSON(github.event.pull_request._links.self) }}' + + - uses: KyoriPowered/action-regex-match@v3 + id: key + with: + text: ${{ github.event.merge_group.head_ref }} + regex: 'pulls/([0-9]+)' + + - name: debug + run: echo label-pr-${{ steps.key.outputs.group1 }} - uses: KyoriPowered/action-regex-match@v3 if: ${{ github.event_name != 'pull_request' }} - id: regex-match + id: get_restore_key with: text: ${{ github.event.merge_group.head_ref }} regex: 'master/pr-([0-9]+)' @@ -45,7 +54,7 @@ jobs: uses: actions/cache@v4 with: path: semantic_version_bump.txt - key: label-pr-${{ steps.regex-match.outputs.group1 }} + key: label-pr-${{ steps.get_restore_key.outputs.group1 }} fail-on-cache-miss: true - name: bump version From 80ee6eea992582bd2cc79dfaa25a81ed755d7b48 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 19:00:45 +0900 Subject: [PATCH 068/245] update debug step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 5ec847f2ec4..9e853c54c1a 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -31,12 +31,12 @@ jobs: git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - name: debug - run: echo '${{ toJSON(github.event.pull_request._links.self) }}' + run: echo '${{ toJSON(github.event.pull_request._links.self.href) }}' - uses: KyoriPowered/action-regex-match@v3 id: key with: - text: ${{ github.event.merge_group.head_ref }} + text: ${{ github.event.pull_request._links.self.href }} regex: 'pulls/([0-9]+)' - name: debug From a8371a580515ff4283d0014d577dd970d6e51784 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 19:02:47 +0900 Subject: [PATCH 069/245] update Release workflow Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 12 ------------ .github/workflows/SaveLabelAsCache.yaml | 7 ++++++- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 9e853c54c1a..b7c5d731b06 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -30,18 +30,6 @@ jobs: git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - - name: debug - run: echo '${{ toJSON(github.event.pull_request._links.self.href) }}' - - - uses: KyoriPowered/action-regex-match@v3 - id: key - with: - text: ${{ github.event.pull_request._links.self.href }} - regex: 'pulls/([0-9]+)' - - - name: debug - run: echo label-pr-${{ steps.key.outputs.group1 }} - - uses: KyoriPowered/action-regex-match@v3 if: ${{ github.event_name != 'pull_request' }} id: get_restore_key diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml index ccbe083835b..81e1efd5629 100644 --- a/.github/workflows/SaveLabelAsCache.yaml +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -23,8 +23,13 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'bump major') run: | echo major > semantic_version_bump.txt + - uses: KyoriPowered/action-regex-match@v3 + id: key + with: + text: ${{ github.event.pull_request._links.self.href }} + regex: 'pulls/([0-9]+)' - name: Cache label uses: actions/cache@v4 with: path: semantic_version_bump.txt - key: label-${{ github.event.pull_request.head.sha }} + key: label-pr-${{ steps.key.outputs.group1 }} From f12546ebb00fa6094f06f7839d694a55ea8ad9f7 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 19:03:21 +0900 Subject: [PATCH 070/245] fix workflow Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index b7c5d731b06..7e1752630b6 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -14,7 +14,6 @@ jobs: - name: install bloom if: ${{ github.event_name != 'pull_request' }} run: apt update && apt install -y python3-bloom git - - name: checkout if: ${{ github.event_name != 'pull_request' }} uses: actions/checkout@v2 @@ -22,21 +21,18 @@ jobs: ref: master fetch-depth: 0 fetch-tags: true - - name: Setup git user if: ${{ github.event_name != 'pull_request' }} run: | git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - - uses: KyoriPowered/action-regex-match@v3 if: ${{ github.event_name != 'pull_request' }} id: get_restore_key with: text: ${{ github.event.merge_group.head_ref }} regex: 'master/pr-([0-9]+)' - - name: Restore labels from cache if: ${{ github.event_name != 'pull_request' }} uses: actions/cache@v4 @@ -44,14 +40,12 @@ jobs: path: semantic_version_bump.txt key: label-pr-${{ steps.get_restore_key.outputs.group1 }} fail-on-cache-miss: true - - name: bump version if: ${{ github.event_name != 'pull_request' }} run: | catkin_generate_changelog -y catkin_tag_changelog --bump $(cat semantic_version_bump.txt) catkin_package_version --bump $(cat semantic_version_bump.txt) - - name: commit changes if: ${{ github.event_name != 'pull_request' }} run: | From 1220a3115d6b7c8fc4e2959b3e6f5bde4df14ad4 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 19:07:50 +0900 Subject: [PATCH 071/245] add debug line Signed-off-by: Masaya Kataoka --- .github/workflows/SaveLabelAsCache.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml index 81e1efd5629..181b0b91578 100644 --- a/.github/workflows/SaveLabelAsCache.yaml +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -23,6 +23,8 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'bump major') run: | echo major > semantic_version_bump.txt + - name: debug + run: cat semantic_version_bump.txt - uses: KyoriPowered/action-regex-match@v3 id: key with: From d1693a55b6435e3acf1376a5bd09cdaa3a2cbe09 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 19:15:55 +0900 Subject: [PATCH 072/245] configure cache step Signed-off-by: Masaya Kataoka --- .github/workflows/SaveLabelAsCache.yaml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml index 181b0b91578..1de9caba582 100644 --- a/.github/workflows/SaveLabelAsCache.yaml +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -11,6 +11,16 @@ jobs: runs-on: ubuntu-22.04 timeout-minutes: 10 steps: + - uses: KyoriPowered/action-regex-match@v3 + id: key + with: + text: ${{ github.event.pull_request._links.self.href }} + regex: 'pulls/([0-9]+)' + - name: Cache label + uses: actions/cache@v4 + with: + path: semantic_version_bump.txt + key: label-pr-${{ steps.key.outputs.group1 }} - name: is_bump_patch if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | @@ -23,15 +33,3 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'bump major') run: | echo major > semantic_version_bump.txt - - name: debug - run: cat semantic_version_bump.txt - - uses: KyoriPowered/action-regex-match@v3 - id: key - with: - text: ${{ github.event.pull_request._links.self.href }} - regex: 'pulls/([0-9]+)' - - name: Cache label - uses: actions/cache@v4 - with: - path: semantic_version_bump.txt - key: label-pr-${{ steps.key.outputs.group1 }} From 1e553f37a1c336375d41bc6c84752e0ff287a2f6 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 19:17:22 +0900 Subject: [PATCH 073/245] save-always Signed-off-by: Masaya Kataoka --- .github/workflows/SaveLabelAsCache.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml index 1de9caba582..a91eb874c32 100644 --- a/.github/workflows/SaveLabelAsCache.yaml +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -21,6 +21,7 @@ jobs: with: path: semantic_version_bump.txt key: label-pr-${{ steps.key.outputs.group1 }} + save-always: true - name: is_bump_patch if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | From 9b399822909127c1df10a7ee728334dfa178c911 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 19:23:44 +0900 Subject: [PATCH 074/245] add clear step Signed-off-by: Masaya Kataoka --- .github/workflows/SaveLabelAsCache.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml index a91eb874c32..7e7d1724db2 100644 --- a/.github/workflows/SaveLabelAsCache.yaml +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -16,6 +16,9 @@ jobs: with: text: ${{ github.event.pull_request._links.self.href }} regex: 'pulls/([0-9]+)' + - name: Clear cache + run: gh cache delete label-pr-${{ steps.key.outputs.group1 }} + continue-on-error: true - name: Cache label uses: actions/cache@v4 with: From 9bb5e600e5c1664c68a3e065442947d15ed1e611 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 19:24:46 +0900 Subject: [PATCH 075/245] add env Signed-off-by: Masaya Kataoka --- .github/workflows/SaveLabelAsCache.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml index 7e7d1724db2..aa859d66e7a 100644 --- a/.github/workflows/SaveLabelAsCache.yaml +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -18,6 +18,8 @@ jobs: regex: 'pulls/([0-9]+)' - name: Clear cache run: gh cache delete label-pr-${{ steps.key.outputs.group1 }} + env: + GH_TOKEN: ${{ github.token }} continue-on-error: true - name: Cache label uses: actions/cache@v4 From 92252a0e29e0bcf314f510b7211172d4c6fc145b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 19:26:24 +0900 Subject: [PATCH 076/245] add checkout step Signed-off-by: Masaya Kataoka --- .github/workflows/SaveLabelAsCache.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml index aa859d66e7a..125d9869384 100644 --- a/.github/workflows/SaveLabelAsCache.yaml +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -16,6 +16,11 @@ jobs: with: text: ${{ github.event.pull_request._links.self.href }} regex: 'pulls/([0-9]+)' + - name: checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + fetch-tags: true - name: Clear cache run: gh cache delete label-pr-${{ steps.key.outputs.group1 }} env: From 50541fc7379d1bc367de31cb8c0c52c5b96ac0a6 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 19:30:48 +0900 Subject: [PATCH 077/245] change token Signed-off-by: Masaya Kataoka --- .github/workflows/SaveLabelAsCache.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml index 125d9869384..46c4a1ce0fa 100644 --- a/.github/workflows/SaveLabelAsCache.yaml +++ b/.github/workflows/SaveLabelAsCache.yaml @@ -24,7 +24,7 @@ jobs: - name: Clear cache run: gh cache delete label-pr-${{ steps.key.outputs.group1 }} env: - GH_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ secrets.BLOOM_GITHUB_TOKEN }} continue-on-error: true - name: Cache label uses: actions/cache@v4 From 198a3538f3d575e43f1f17f099ac4f52f6d55811 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 20:39:51 +0900 Subject: [PATCH 078/245] update release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 69 ++++++++++++++++++++----- .github/workflows/SaveLabelAsCache.yaml | 46 ----------------- 2 files changed, 57 insertions(+), 58 deletions(-) delete mode 100644 .github/workflows/SaveLabelAsCache.yaml diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 7e1752630b6..beae4cd6632 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -1,53 +1,98 @@ name: Release on: pull_request: + branches: + - master merge_group: types: [checks_requested] jobs: + save_label_as_cache: + name: SaveLabelAsCache + runs-on: ubuntu-22.04 + if: ${{ github.event_name == 'pull_request' }} + timeout-minutes: 10 + steps: + - uses: KyoriPowered/action-regex-match@v3 + id: key + with: + text: ${{ github.event.pull_request._links.self.href }} + regex: 'pulls/([0-9]+)' + - name: checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + fetch-tags: true + # - name: Clear cache + # run: gh cache delete label-pr-${{ steps.key.outputs.group1 }} + # env: + # GH_TOKEN: ${{ secrets.BLOOM_GITHUB_TOKEN }} + # continue-on-error: true + # - name: Cache label + # uses: actions/cache@v4 + # with: + # path: semantic_version_bump.txt + # key: label-pr-${{ steps.key.outputs.group1 }} + # save-always: true + - name: is_bump_patch + if: contains(github.event.pull_request.labels.*.name, 'bump patch') + run: | + echo patch > semantic_version_bump.txt + - name: is_bump_minor + if: contains(github.event.pull_request.labels.*.name, 'bump minor') + run: | + echo minor > semantic_version_bump.txt + - name: is_bump_major + if: contains(github.event.pull_request.labels.*.name, 'bump major') + run: | + echo major > semantic_version_bump.txt + - uses: actions/upload-artifact@v4 + with: + name: label-pr-${{ steps.key.outputs.group1 }} + path: semantic_version_bump.txt + release: name: Release runs-on: ubuntu-22.04 + if: ${{ github.event_name != 'pull_request' }} timeout-minutes: 10 container: ros:humble steps: - name: install bloom - if: ${{ github.event_name != 'pull_request' }} run: apt update && apt install -y python3-bloom git - name: checkout - if: ${{ github.event_name != 'pull_request' }} uses: actions/checkout@v2 with: ref: master fetch-depth: 0 fetch-tags: true - name: Setup git user - if: ${{ github.event_name != 'pull_request' }} run: | git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - uses: KyoriPowered/action-regex-match@v3 - if: ${{ github.event_name != 'pull_request' }} id: get_restore_key with: text: ${{ github.event.merge_group.head_ref }} regex: 'master/pr-([0-9]+)' - - name: Restore labels from cache - if: ${{ github.event_name != 'pull_request' }} - uses: actions/cache@v4 + - name: Merge branch + run: git merge origin ${{ github.event.merge_group.head_ref }} + - uses: actions/download-artifact@v4 with: - path: semantic_version_bump.txt - key: label-pr-${{ steps.get_restore_key.outputs.group1 }} - fail-on-cache-miss: true + name: label-pr-${{ steps.get_restore_key.outputs.group1 }} + # - name: Restore labels from cache + # uses: actions/cache@v4 + # with: + # path: semantic_version_bump.txt + # key: label-pr-${{ steps.get_restore_key.outputs.group1 }} + # fail-on-cache-miss: true - name: bump version - if: ${{ github.event_name != 'pull_request' }} run: | catkin_generate_changelog -y catkin_tag_changelog --bump $(cat semantic_version_bump.txt) catkin_package_version --bump $(cat semantic_version_bump.txt) - name: commit changes - if: ${{ github.event_name != 'pull_request' }} run: | git add . git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" diff --git a/.github/workflows/SaveLabelAsCache.yaml b/.github/workflows/SaveLabelAsCache.yaml deleted file mode 100644 index 46c4a1ce0fa..00000000000 --- a/.github/workflows/SaveLabelAsCache.yaml +++ /dev/null @@ -1,46 +0,0 @@ -name: SaveLabelAsCache - -on: - pull_request: - branches: - - master - -jobs: - save_label_as_cache: - name: SaveLabelAsCache - runs-on: ubuntu-22.04 - timeout-minutes: 10 - steps: - - uses: KyoriPowered/action-regex-match@v3 - id: key - with: - text: ${{ github.event.pull_request._links.self.href }} - regex: 'pulls/([0-9]+)' - - name: checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - fetch-tags: true - - name: Clear cache - run: gh cache delete label-pr-${{ steps.key.outputs.group1 }} - env: - GH_TOKEN: ${{ secrets.BLOOM_GITHUB_TOKEN }} - continue-on-error: true - - name: Cache label - uses: actions/cache@v4 - with: - path: semantic_version_bump.txt - key: label-pr-${{ steps.key.outputs.group1 }} - save-always: true - - name: is_bump_patch - if: contains(github.event.pull_request.labels.*.name, 'bump patch') - run: | - echo patch > semantic_version_bump.txt - - name: is_bump_minor - if: contains(github.event.pull_request.labels.*.name, 'bump minor') - run: | - echo minor > semantic_version_bump.txt - - name: is_bump_major - if: contains(github.event.pull_request.labels.*.name, 'bump major') - run: | - echo major > semantic_version_bump.txt From 0f1a87a9487a0793996d9795a1e6f118ef160b59 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 20:41:51 +0900 Subject: [PATCH 079/245] modify trigger Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index beae4cd6632..9e8ef963a64 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -54,45 +54,53 @@ jobs: release: name: Release runs-on: ubuntu-22.04 - if: ${{ github.event_name != 'pull_request' }} timeout-minutes: 10 container: ros:humble steps: - name: install bloom + if: ${{ github.event_name != 'pull_request' }} run: apt update && apt install -y python3-bloom git - name: checkout uses: actions/checkout@v2 + if: ${{ github.event_name != 'pull_request' }} with: ref: master fetch-depth: 0 fetch-tags: true - name: Setup git user + if: ${{ github.event_name != 'pull_request' }} run: | git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - uses: KyoriPowered/action-regex-match@v3 + if: ${{ github.event_name != 'pull_request' }} id: get_restore_key with: text: ${{ github.event.merge_group.head_ref }} regex: 'master/pr-([0-9]+)' - name: Merge branch + if: ${{ github.event_name != 'pull_request' }} run: git merge origin ${{ github.event.merge_group.head_ref }} - uses: actions/download-artifact@v4 + if: ${{ github.event_name != 'pull_request' }} with: name: label-pr-${{ steps.get_restore_key.outputs.group1 }} # - name: Restore labels from cache + # if: ${{ github.event_name != 'pull_request' }} # uses: actions/cache@v4 # with: # path: semantic_version_bump.txt # key: label-pr-${{ steps.get_restore_key.outputs.group1 }} # fail-on-cache-miss: true - name: bump version + if: ${{ github.event_name != 'pull_request' }} run: | catkin_generate_changelog -y catkin_tag_changelog --bump $(cat semantic_version_bump.txt) catkin_package_version --bump $(cat semantic_version_bump.txt) - name: commit changes + if: ${{ github.event_name != 'pull_request' }} run: | git add . git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" From cba41ebe516d2d95fc9a9ec946fd1edbc1c9fb99 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 20:49:56 +0900 Subject: [PATCH 080/245] remove origin Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 9e8ef963a64..f6996e6e6af 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -81,7 +81,7 @@ jobs: regex: 'master/pr-([0-9]+)' - name: Merge branch if: ${{ github.event_name != 'pull_request' }} - run: git merge origin ${{ github.event.merge_group.head_ref }} + run: git merge ${{ github.event.merge_group.head_ref }} - uses: actions/download-artifact@v4 if: ${{ github.event_name != 'pull_request' }} with: From 8a40408cb7f466f0a88ae42034a192aa7cdb624f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 20:53:11 +0900 Subject: [PATCH 081/245] add tmate Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index f6996e6e6af..ba7473642ce 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -79,6 +79,8 @@ jobs: with: text: ${{ github.event.merge_group.head_ref }} regex: 'master/pr-([0-9]+)' + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: Merge branch if: ${{ github.event_name != 'pull_request' }} run: git merge ${{ github.event.merge_group.head_ref }} From 59050fa548e62ddabbd654fe029aab1ef053be82 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 20:55:21 +0900 Subject: [PATCH 082/245] add if Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index ba7473642ce..27aa86508d2 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -80,6 +80,7 @@ jobs: text: ${{ github.event.merge_group.head_ref }} regex: 'master/pr-([0-9]+)' - name: Setup tmate session + if: ${{ github.event_name != 'pull_request' }} uses: mxschmitt/action-tmate@v3 - name: Merge branch if: ${{ github.event_name != 'pull_request' }} From 87734b68a3fc09741643f902affbdf012dfbf4ce Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 21:00:26 +0900 Subject: [PATCH 083/245] use pull Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 27aa86508d2..c898d845f9d 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -84,7 +84,7 @@ jobs: uses: mxschmitt/action-tmate@v3 - name: Merge branch if: ${{ github.event_name != 'pull_request' }} - run: git merge ${{ github.event.merge_group.head_ref }} + run: git pull origin ${{ github.event.merge_group.head_ref }} - uses: actions/download-artifact@v4 if: ${{ github.event_name != 'pull_request' }} with: From a7795120eeb193da44d8b67a58abec7df8662815 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 18 Jan 2024 21:05:58 +0900 Subject: [PATCH 084/245] comment out tmate Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index c898d845f9d..11991c7d108 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -79,9 +79,9 @@ jobs: with: text: ${{ github.event.merge_group.head_ref }} regex: 'master/pr-([0-9]+)' - - name: Setup tmate session - if: ${{ github.event_name != 'pull_request' }} - uses: mxschmitt/action-tmate@v3 + # - name: Setup tmate session + # if: ${{ github.event_name != 'pull_request' }} + # uses: mxschmitt/action-tmate@v3 - name: Merge branch if: ${{ github.event_name != 'pull_request' }} run: git pull origin ${{ github.event.merge_group.head_ref }} From 201f8022a34befadc424bc88bd4c38d8895c41b3 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 14:13:15 +0900 Subject: [PATCH 085/245] add checkout step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 50 ++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 11991c7d108..09aba9d1a45 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -23,17 +23,17 @@ jobs: with: fetch-depth: 0 fetch-tags: true - # - name: Clear cache - # run: gh cache delete label-pr-${{ steps.key.outputs.group1 }} - # env: - # GH_TOKEN: ${{ secrets.BLOOM_GITHUB_TOKEN }} - # continue-on-error: true - # - name: Cache label - # uses: actions/cache@v4 - # with: - # path: semantic_version_bump.txt - # key: label-pr-${{ steps.key.outputs.group1 }} - # save-always: true + - name: Clear cache + run: gh cache delete label-pr-${{ steps.key.outputs.group1 }} + env: + GH_TOKEN: ${{ secrets.BLOOM_GITHUB_TOKEN }} + continue-on-error: true + - name: Cache label + uses: actions/cache@v4 + with: + path: semantic_version_bump.txt + key: label-pr-${{ steps.key.outputs.group1 }} + save-always: true - name: is_bump_patch if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | @@ -46,10 +46,12 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'bump major') run: | echo major > semantic_version_bump.txt - - uses: actions/upload-artifact@v4 - with: - name: label-pr-${{ steps.key.outputs.group1 }} - path: semantic_version_bump.txt + - name: checkout + run: git checkout master + # - uses: actions/upload-artifact@v4 + # with: + # name: label-pr-${{ steps.key.outputs.group1 }} + # path: semantic_version_bump.txt release: name: Release @@ -85,17 +87,17 @@ jobs: - name: Merge branch if: ${{ github.event_name != 'pull_request' }} run: git pull origin ${{ github.event.merge_group.head_ref }} - - uses: actions/download-artifact@v4 - if: ${{ github.event_name != 'pull_request' }} - with: - name: label-pr-${{ steps.get_restore_key.outputs.group1 }} - # - name: Restore labels from cache + # - uses: actions/download-artifact@v4 # if: ${{ github.event_name != 'pull_request' }} - # uses: actions/cache@v4 # with: - # path: semantic_version_bump.txt - # key: label-pr-${{ steps.get_restore_key.outputs.group1 }} - # fail-on-cache-miss: true + # name: label-pr-${{ steps.get_restore_key.outputs.group1 }} + - name: Restore labels from cache + if: ${{ github.event_name != 'pull_request' }} + uses: actions/cache@v4 + with: + path: semantic_version_bump.txt + key: label-pr-${{ steps.get_restore_key.outputs.group1 }} + fail-on-cache-miss: true - name: bump version if: ${{ github.event_name != 'pull_request' }} run: | From eac6eb1f8e4a34ffade4fba41d46e3ff9224a827 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 14:30:44 +0900 Subject: [PATCH 086/245] update Release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 90 ++++++++++------------------------ 1 file changed, 25 insertions(+), 65 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 09aba9d1a45..d09b1add2ea 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -7,52 +7,6 @@ on: types: [checks_requested] jobs: - save_label_as_cache: - name: SaveLabelAsCache - runs-on: ubuntu-22.04 - if: ${{ github.event_name == 'pull_request' }} - timeout-minutes: 10 - steps: - - uses: KyoriPowered/action-regex-match@v3 - id: key - with: - text: ${{ github.event.pull_request._links.self.href }} - regex: 'pulls/([0-9]+)' - - name: checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - fetch-tags: true - - name: Clear cache - run: gh cache delete label-pr-${{ steps.key.outputs.group1 }} - env: - GH_TOKEN: ${{ secrets.BLOOM_GITHUB_TOKEN }} - continue-on-error: true - - name: Cache label - uses: actions/cache@v4 - with: - path: semantic_version_bump.txt - key: label-pr-${{ steps.key.outputs.group1 }} - save-always: true - - name: is_bump_patch - if: contains(github.event.pull_request.labels.*.name, 'bump patch') - run: | - echo patch > semantic_version_bump.txt - - name: is_bump_minor - if: contains(github.event.pull_request.labels.*.name, 'bump minor') - run: | - echo minor > semantic_version_bump.txt - - name: is_bump_major - if: contains(github.event.pull_request.labels.*.name, 'bump major') - run: | - echo major > semantic_version_bump.txt - - name: checkout - run: git checkout master - # - uses: actions/upload-artifact@v4 - # with: - # name: label-pr-${{ steps.key.outputs.group1 }} - # path: semantic_version_bump.txt - release: name: Release runs-on: ubuntu-22.04 @@ -77,33 +31,39 @@ jobs: git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - uses: KyoriPowered/action-regex-match@v3 if: ${{ github.event_name != 'pull_request' }} - id: get_restore_key + id: get_pull_request_number with: text: ${{ github.event.merge_group.head_ref }} regex: 'master/pr-([0-9]+)' - # - name: Setup tmate session - # if: ${{ github.event_name != 'pull_request' }} - # uses: mxschmitt/action-tmate@v3 - name: Merge branch if: ${{ github.event_name != 'pull_request' }} run: git pull origin ${{ github.event.merge_group.head_ref }} - # - uses: actions/download-artifact@v4 - # if: ${{ github.event_name != 'pull_request' }} - # with: - # name: label-pr-${{ steps.get_restore_key.outputs.group1 }} - - name: Restore labels from cache - if: ${{ github.event_name != 'pull_request' }} - uses: actions/cache@v4 - with: - path: semantic_version_bump.txt - key: label-pr-${{ steps.get_restore_key.outputs.group1 }} - fail-on-cache-miss: true - - name: bump version - if: ${{ github.event_name != 'pull_request' }} + - name: Get labels of the pull request + id: get_label + uses: fml09/get-label + wieh: + pull_number: ${{ steps.get_pull_request_number.outputs.group1 }} + repo: scenario_simulator_v2 + owner: merge-queue-testing + token: ${{ secrets.GITHUB_TOKEN }} + - name: bump patch version + if: github.event_name != 'pull_request' && (!contains(steps.get_label.output.labels, 'bump patch')) + run: | + catkin_generate_changelog -y + catkin_tag_changelog --bump patch + catkin_package_version --bump patch + - name: bump minor version + if: github.event_name != 'pull_request' && (!contains(steps.get_label.output.labels, 'bump minor')) + run: | + catkin_generate_changelog -y + catkin_tag_changelog --bump minor + catkin_package_version --bump minor + - name: bump major version + if: github.event_name != 'pull_request' && (!contains(steps.get_label.output.labels, 'bump major')) run: | catkin_generate_changelog -y - catkin_tag_changelog --bump $(cat semantic_version_bump.txt) - catkin_package_version --bump $(cat semantic_version_bump.txt) + catkin_tag_changelog --bump major + catkin_package_version --bump major - name: commit changes if: ${{ github.event_name != 'pull_request' }} run: | From 4e4b94ebfab724c0d10efb7ca35154f24d387779 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 14:32:50 +0900 Subject: [PATCH 087/245] specify version Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index d09b1add2ea..32e2c1e44e9 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -40,7 +40,7 @@ jobs: run: git pull origin ${{ github.event.merge_group.head_ref }} - name: Get labels of the pull request id: get_label - uses: fml09/get-label + uses: fml09/get-label@v0.1.1 wieh: pull_number: ${{ steps.get_pull_request_number.outputs.group1 }} repo: scenario_simulator_v2 From 1b93053070bc0a2fc3c6df52bb6643e109a42d97 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 14:33:38 +0900 Subject: [PATCH 088/245] fix typo Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 32e2c1e44e9..ba4577b2ceb 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -41,7 +41,7 @@ jobs: - name: Get labels of the pull request id: get_label uses: fml09/get-label@v0.1.1 - wieh: + with: pull_number: ${{ steps.get_pull_request_number.outputs.group1 }} repo: scenario_simulator_v2 owner: merge-queue-testing From e8d285dda59b6f35a6418ef77b0f4a668f1446a5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 14:38:23 +0900 Subject: [PATCH 089/245] fix changelog Signed-off-by: Masaya Kataoka --- scenario_simulator_v2/CHANGELOG.rst | 4 ++-- scenario_simulator_v2/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 32c1a85b78a..2148962eb5c 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -0.8.1 (2023-12-05) ------------------- +Forthcoming +----------- * Merge pull request `#10 `_ from hakuturu583/test/release update CHANGELOG * update CHANGELOG diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c456a27a948..c49ab6f3033 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.1 + 0.8.0 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 From 6c4d42f8faf3ba6deaf8e0b0ead90405d3b3ef5f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 14:47:53 +0900 Subject: [PATCH 090/245] add debug line Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index ba4577b2ceb..45e38b090be 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -47,23 +47,26 @@ jobs: owner: merge-queue-testing token: ${{ secrets.GITHUB_TOKEN }} - name: bump patch version - if: github.event_name != 'pull_request' && (!contains(steps.get_label.output.labels, 'bump patch')) + if: github.event_name != 'pull_request' && (contains(steps.get_label.output.labels, 'bump patch')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: bump minor version - if: github.event_name != 'pull_request' && (!contains(steps.get_label.output.labels, 'bump minor')) + if: github.event_name != 'pull_request' && (contains(steps.get_label.output.labels, 'bump minor')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: bump major version - if: github.event_name != 'pull_request' && (!contains(steps.get_label.output.labels, 'bump major')) + if: github.event_name != 'pull_request' && (contains(steps.get_label.output.labels, 'bump major')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major + - name: print number + run: echo ${{ steps.get_label.output.labels }} + - uses: mxschmitt/action-tmate@v3 - name: commit changes if: ${{ github.event_name != 'pull_request' }} run: | From ed4f8c102f21ab3419e43e38d13f1920fae36671 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 14:52:28 +0900 Subject: [PATCH 091/245] add if Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 45e38b090be..0814f4a6575 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -64,9 +64,11 @@ jobs: catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major - - name: print number + - name: print labels + if: ${{ github.event_name != 'pull_request' }} run: echo ${{ steps.get_label.output.labels }} - uses: mxschmitt/action-tmate@v3 + if: ${{ github.event_name != 'pull_request' }} - name: commit changes if: ${{ github.event_name != 'pull_request' }} run: | From f9a3538d368827fceb4dcccc799960ea7ba685d6 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 14:55:32 +0900 Subject: [PATCH 092/245] fix typo Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 0814f4a6575..372fe15a7c2 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -47,26 +47,26 @@ jobs: owner: merge-queue-testing token: ${{ secrets.GITHUB_TOKEN }} - name: bump patch version - if: github.event_name != 'pull_request' && (contains(steps.get_label.output.labels, 'bump patch')) + if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump patch')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: bump minor version - if: github.event_name != 'pull_request' && (contains(steps.get_label.output.labels, 'bump minor')) + if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump minor')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: bump major version - if: github.event_name != 'pull_request' && (contains(steps.get_label.output.labels, 'bump major')) + if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump major')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major - name: print labels if: ${{ github.event_name != 'pull_request' }} - run: echo ${{ steps.get_label.output.labels }} + run: echo ${{ steps.get_label.outputs.labels }} - uses: mxschmitt/action-tmate@v3 if: ${{ github.event_name != 'pull_request' }} - name: commit changes From 421a3b4ced4c96b8dc4f68cceef19d5486b48f90 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 14:58:29 +0900 Subject: [PATCH 093/245] remove debug step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 372fe15a7c2..721b43190fb 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -64,11 +64,6 @@ jobs: catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major - - name: print labels - if: ${{ github.event_name != 'pull_request' }} - run: echo ${{ steps.get_label.outputs.labels }} - - uses: mxschmitt/action-tmate@v3 - if: ${{ github.event_name != 'pull_request' }} - name: commit changes if: ${{ github.event_name != 'pull_request' }} run: | From 16a6e9b7589900f4aa8f693f9ad73c0d4784737e Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 15:09:14 +0900 Subject: [PATCH 094/245] add push step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 721b43190fb..bfccd25c6ec 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -64,12 +64,21 @@ jobs: catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major - - name: commit changes + - name: commit changes and push if: ${{ github.event_name != 'pull_request' }} - run: | - git add . - git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" - git push - git tag -a $(catkin_package_version) -m "release $(catkin_package_version)" - git push origin $(catkin_package_version) - working-directory: scenario_simulator_v2 + uses: dsayling/commit-branch-check-action@v0.1 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + commit-message: "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" + dest-branch: ${{github.event.pull_request.head.ref}} + verify-checks: true + delete-after-checks: true + # - name: commit changes + # if: ${{ github.event_name != 'pull_request' }} + # run: | + # git add . + # git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" + # git push + # git tag -a $(catkin_package_version) -m "release $(catkin_package_version)" + # git push origin $(catkin_package_version) + # working-directory: scenario_simulator_v2 From d36b4c1a63c097653db571379c12dfe063e89743 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 15:12:21 +0900 Subject: [PATCH 095/245] specify version Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index bfccd25c6ec..8949d2b06e4 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -66,7 +66,7 @@ jobs: catkin_package_version --bump major - name: commit changes and push if: ${{ github.event_name != 'pull_request' }} - uses: dsayling/commit-branch-check-action@v0.1 + uses: dsayling/commit-branch-check-action@v0.1.6 with: github-token: ${{ secrets.GITHUB_TOKEN }} commit-message: "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" From 790715cf0c5c1068390af32bb7fdd7933157a566 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 15:18:44 +0900 Subject: [PATCH 096/245] add merge step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 8949d2b06e4..2b390d6b1ba 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -64,21 +64,21 @@ jobs: catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major - - name: commit changes and push - if: ${{ github.event_name != 'pull_request' }} - uses: dsayling/commit-branch-check-action@v0.1.6 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" - dest-branch: ${{github.event.pull_request.head.ref}} - verify-checks: true - delete-after-checks: true - # - name: commit changes + # - name: commit changes and push # if: ${{ github.event_name != 'pull_request' }} - # run: | - # git add . - # git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" - # git push - # git tag -a $(catkin_package_version) -m "release $(catkin_package_version)" - # git push origin $(catkin_package_version) - # working-directory: scenario_simulator_v2 + # uses: dsayling/commit-branch-check-action@v0.1.6 + # with: + # github-token: ${{ secrets.GITHUB_TOKEN }} + # commit-message: "Bump version of scenario_simulator_v2" + # dest-branch: ${{github.event.pull_request.head.ref}} + # verify-checks: true + # delete-after-checks: true + - name: commit changes + if: ${{ github.event_name != 'pull_request' }} + run: | + git add . + git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" + git checkout ${{ github.event.merge_group.head_ref }} + git merge master + git push + working-directory: scenario_simulator_v2 From 92c213922b03e0113e60215976f83ce569d24d82 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 15:29:32 +0900 Subject: [PATCH 097/245] modify branch Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 2b390d6b1ba..a8bdd441b69 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v2 if: ${{ github.event_name != 'pull_request' }} with: - ref: master + # ref: master fetch-depth: 0 fetch-tags: true - name: Setup git user @@ -78,7 +78,5 @@ jobs: run: | git add . git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" - git checkout ${{ github.event.merge_group.head_ref }} - git merge master git push working-directory: scenario_simulator_v2 From c5e6c8730e59111224fa2d01cc1d78c3bca9c52e Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 15:36:04 +0900 Subject: [PATCH 098/245] add token Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index a8bdd441b69..8ca52a459a8 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -29,6 +29,7 @@ jobs: git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 + git config --global credential.helper ${{ secrets.BLOOM_GITHUB_TOKEN }} - uses: KyoriPowered/action-regex-match@v3 if: ${{ github.event_name != 'pull_request' }} id: get_pull_request_number From d817f0e11700eb43ee2efa046097658c20007865 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 15:40:11 +0900 Subject: [PATCH 099/245] use action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 8ca52a459a8..62bf140cd4a 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -65,19 +65,19 @@ jobs: catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major - # - name: commit changes and push - # if: ${{ github.event_name != 'pull_request' }} - # uses: dsayling/commit-branch-check-action@v0.1.6 - # with: - # github-token: ${{ secrets.GITHUB_TOKEN }} - # commit-message: "Bump version of scenario_simulator_v2" - # dest-branch: ${{github.event.pull_request.head.ref}} - # verify-checks: true - # delete-after-checks: true - - name: commit changes + - name: commit changes and push if: ${{ github.event_name != 'pull_request' }} - run: | - git add . - git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" - git push - working-directory: scenario_simulator_v2 + uses: dsayling/commit-branch-check-action@v0.1.6 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + commit-message: "Bump version of scenario_simulator_v2" + dest-branch: ${{github.event.pull_request.head.ref}} + verify-checks: true + delete-after-checks: true + # - name: commit changes + # if: ${{ github.event_name != 'pull_request' }} + # run: | + # git add . + # git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" + # git push + # working-directory: scenario_simulator_v2 From d9563dc6d3f1fccae174f36eab0c8cf5990f87d3 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 15:53:58 +0900 Subject: [PATCH 100/245] modify permission Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 62bf140cd4a..79d6cf7e785 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -10,6 +10,17 @@ jobs: release: name: Release runs-on: ubuntu-22.04 + permissions: + actions: write + checks: write + contents: write + deployments: write + issues: write + packages: write + pull-requests: write + repository-projects: write + security-events: write + statuses: write timeout-minutes: 10 container: ros:humble steps: @@ -29,7 +40,7 @@ jobs: git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - git config --global credential.helper ${{ secrets.BLOOM_GITHUB_TOKEN }} + git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} - uses: KyoriPowered/action-regex-match@v3 if: ${{ github.event_name != 'pull_request' }} id: get_pull_request_number @@ -65,19 +76,10 @@ jobs: catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major - - name: commit changes and push + - name: commit changes if: ${{ github.event_name != 'pull_request' }} - uses: dsayling/commit-branch-check-action@v0.1.6 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "Bump version of scenario_simulator_v2" - dest-branch: ${{github.event.pull_request.head.ref}} - verify-checks: true - delete-after-checks: true - # - name: commit changes - # if: ${{ github.event_name != 'pull_request' }} - # run: | - # git add . - # git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" - # git push - # working-directory: scenario_simulator_v2 + run: | + git add . + git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" + git push + working-directory: scenario_simulator_v2 From 9286a83f5b83d3a6588b759aaf3f8fc3a4e155f7 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 16:08:43 +0900 Subject: [PATCH 101/245] modify commit changes step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 79d6cf7e785..66107aed285 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -76,10 +76,18 @@ jobs: catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major + - name: Get branch name based on PR ID + uses: andrevalentin/get-branch-name-by-pr@1.0.0 + id: pr_data + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + pr-id: ${{ steps.get_pull_request_number.outputs.group1 }} - name: commit changes if: ${{ github.event_name != 'pull_request' }} run: | git add . git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" - git push + git checkout ${{ steps.pr_data.outputs.branch }} + git merge ${{ github.event.merge_group.head_ref }} + git push ${{ steps.pr_data.outputs.branch }} working-directory: scenario_simulator_v2 From c4252151a171d25a3dff5556b5e2341e65c5fcee Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 16:09:57 +0900 Subject: [PATCH 102/245] change version Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 66107aed285..e707c36f7f3 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -77,7 +77,7 @@ jobs: catkin_tag_changelog --bump major catkin_package_version --bump major - name: Get branch name based on PR ID - uses: andrevalentin/get-branch-name-by-pr@1.0.0 + uses: andrevalentin/get-branch-name-by-pr@v1 id: pr_data with: repo-token: ${{ secrets.GITHUB_TOKEN }} From 65c86eb35d49d1ccc4abfc8eda540b904b5a770b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 16:11:35 +0900 Subject: [PATCH 103/245] add if step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index e707c36f7f3..0902bb42387 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -51,6 +51,7 @@ jobs: if: ${{ github.event_name != 'pull_request' }} run: git pull origin ${{ github.event.merge_group.head_ref }} - name: Get labels of the pull request + if: ${{ github.event_name != 'pull_request' }} id: get_label uses: fml09/get-label@v0.1.1 with: @@ -77,6 +78,7 @@ jobs: catkin_tag_changelog --bump major catkin_package_version --bump major - name: Get branch name based on PR ID + if: ${{ github.event_name != 'pull_request' }} uses: andrevalentin/get-branch-name-by-pr@v1 id: pr_data with: From 406aff049ffbf37cc7bb5738c4885178d7a97d30 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 19 Jan 2024 16:22:10 +0900 Subject: [PATCH 104/245] modifty checkout branch Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 0902bb42387..e7aec8c1d6c 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -24,6 +24,20 @@ jobs: timeout-minutes: 10 container: ros:humble steps: + - name: Get pull request number + uses: KyoriPowered/action-regex-match@v3 + if: ${{ github.event_name != 'pull_request' }} + id: get_pull_request_number + with: + text: ${{ github.event.merge_group.head_ref }} + regex: 'master/pr-([0-9]+)' + - name: Get branch name based on pull request ID + if: ${{ github.event_name != 'pull_request' }} + uses: andrevalentin/get-branch-name-by-pr@v1 + id: pr_data + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + pr-id: ${{ steps.get_pull_request_number.outputs.group1 }} - name: install bloom if: ${{ github.event_name != 'pull_request' }} run: apt update && apt install -y python3-bloom git @@ -31,7 +45,7 @@ jobs: uses: actions/checkout@v2 if: ${{ github.event_name != 'pull_request' }} with: - # ref: master + ref: ${{ steps.pr_data.outputs.branch }} fetch-depth: 0 fetch-tags: true - name: Setup git user @@ -41,12 +55,6 @@ jobs: git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} - - uses: KyoriPowered/action-regex-match@v3 - if: ${{ github.event_name != 'pull_request' }} - id: get_pull_request_number - with: - text: ${{ github.event.merge_group.head_ref }} - regex: 'master/pr-([0-9]+)' - name: Merge branch if: ${{ github.event_name != 'pull_request' }} run: git pull origin ${{ github.event.merge_group.head_ref }} @@ -77,19 +85,10 @@ jobs: catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major - - name: Get branch name based on PR ID - if: ${{ github.event_name != 'pull_request' }} - uses: andrevalentin/get-branch-name-by-pr@v1 - id: pr_data - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - pr-id: ${{ steps.get_pull_request_number.outputs.group1 }} - name: commit changes if: ${{ github.event_name != 'pull_request' }} run: | git add . git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" - git checkout ${{ steps.pr_data.outputs.branch }} - git merge ${{ github.event.merge_group.head_ref }} - git push ${{ steps.pr_data.outputs.branch }} + git push working-directory: scenario_simulator_v2 From cf36574a5ae581d0b0afef4cf254d88e2c2291a0 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 12:56:24 +0900 Subject: [PATCH 105/245] modify release trigger Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index e7aec8c1d6c..4dccca1a069 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -3,11 +3,11 @@ on: pull_request: branches: - master - merge_group: - types: [checks_requested] + types: [closed] jobs: release: + if: github.event.pull_request.merged == true name: Release runs-on: ubuntu-22.04 permissions: @@ -26,40 +26,33 @@ jobs: steps: - name: Get pull request number uses: KyoriPowered/action-regex-match@v3 - if: ${{ github.event_name != 'pull_request' }} id: get_pull_request_number with: text: ${{ github.event.merge_group.head_ref }} regex: 'master/pr-([0-9]+)' - name: Get branch name based on pull request ID - if: ${{ github.event_name != 'pull_request' }} uses: andrevalentin/get-branch-name-by-pr@v1 id: pr_data with: repo-token: ${{ secrets.GITHUB_TOKEN }} pr-id: ${{ steps.get_pull_request_number.outputs.group1 }} - name: install bloom - if: ${{ github.event_name != 'pull_request' }} run: apt update && apt install -y python3-bloom git - name: checkout uses: actions/checkout@v2 - if: ${{ github.event_name != 'pull_request' }} with: - ref: ${{ steps.pr_data.outputs.branch }} + ref: master fetch-depth: 0 fetch-tags: true - name: Setup git user - if: ${{ github.event_name != 'pull_request' }} run: | git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} - name: Merge branch - if: ${{ github.event_name != 'pull_request' }} run: git pull origin ${{ github.event.merge_group.head_ref }} - name: Get labels of the pull request - if: ${{ github.event_name != 'pull_request' }} id: get_label uses: fml09/get-label@v0.1.1 with: @@ -86,7 +79,6 @@ jobs: catkin_tag_changelog --bump major catkin_package_version --bump major - name: commit changes - if: ${{ github.event_name != 'pull_request' }} run: | git add . git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" From 721c28159b02e9228b9ddf2e53d51da838dd97c9 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 14:44:18 +0900 Subject: [PATCH 106/245] add CheckBranchUpToDate action Signed-off-by: Masaya Kataoka --- .github/workflows/CheckBranchUpToDate.yaml | 23 ++++++++++++++++++++++ .github/workflows/Release.yaml | 12 +++++------ 2 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/CheckBranchUpToDate.yaml diff --git a/.github/workflows/CheckBranchUpToDate.yaml b/.github/workflows/CheckBranchUpToDate.yaml new file mode 100644 index 00000000000..be5f28502a9 --- /dev/null +++ b/.github/workflows/CheckBranchUpToDate.yaml @@ -0,0 +1,23 @@ +name: Release +on: + pull_request: + branches: + - master + merge_group: + types: [checks_requested] + +jobs: + check_branch_up_to_date: + name: CheckBranchUpToDate + timeout-minutes: 10 + container: ros:humble + steps: + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + fetch-tags: true + - name: Check pull-request up to date + uses: Automattic/action-pr-is-up-to-date@v2 + with: + branc: master diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 4dccca1a069..1241887a85b 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -46,10 +46,10 @@ jobs: fetch-tags: true - name: Setup git user run: | - git config --global user.name "Release Bot" - git config --global user.email "action@github.com" + git config --global user.name "Masaya Kataoka" + git config --global user.email "ms.kataoka@gmail.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} + git config --global credential.helper ${{ secrets.BLOOM_GITHUB_TOKEN }} - name: Merge branch run: git pull origin ${{ github.event.merge_group.head_ref }} - name: Get labels of the pull request @@ -61,19 +61,19 @@ jobs: owner: merge-queue-testing token: ${{ secrets.GITHUB_TOKEN }} - name: bump patch version - if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump patch')) + if: contains(steps.get_label.outputs.labels, 'bump patch') run: | catkin_generate_changelog -y catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: bump minor version - if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump minor')) + if: contains(steps.get_label.outputs.labels, 'bump minor') run: | catkin_generate_changelog -y catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: bump major version - if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump major')) + if: contains(steps.get_label.outputs.labels, 'bump major') run: | catkin_generate_changelog -y catkin_tag_changelog --bump major From 55d6aa164f968bd1e059ea50ef1c75ae314e54cd Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 14:46:14 +0900 Subject: [PATCH 107/245] fix action Signed-off-by: Masaya Kataoka --- .github/workflows/CheckBranchUpToDate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CheckBranchUpToDate.yaml b/.github/workflows/CheckBranchUpToDate.yaml index be5f28502a9..9bff67be22c 100644 --- a/.github/workflows/CheckBranchUpToDate.yaml +++ b/.github/workflows/CheckBranchUpToDate.yaml @@ -1,4 +1,4 @@ -name: Release +name: CheckBranchUpToDate on: pull_request: branches: @@ -10,7 +10,7 @@ jobs: check_branch_up_to_date: name: CheckBranchUpToDate timeout-minutes: 10 - container: ros:humble + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 From 84eb94e437b618219c9c098d23e6a1b917eb9a49 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 14:57:38 +0900 Subject: [PATCH 108/245] update actions for release Signed-off-by: Masaya Kataoka --- .github/workflows/CheckBranchUpToDate.yaml | 13 ++++++---- .github/workflows/Release.yaml | 28 +++------------------- 2 files changed, 12 insertions(+), 29 deletions(-) diff --git a/.github/workflows/CheckBranchUpToDate.yaml b/.github/workflows/CheckBranchUpToDate.yaml index 9bff67be22c..a8917e7cf78 100644 --- a/.github/workflows/CheckBranchUpToDate.yaml +++ b/.github/workflows/CheckBranchUpToDate.yaml @@ -12,12 +12,17 @@ jobs: timeout-minutes: 10 runs-on: ubuntu-22.04 steps: - - name: Checkout - uses: actions/checkout@v2 + # For pull requet check + - name: Check pull-request up to date + if: github.event_name == 'pull_request' + uses: Automattic/action-pr-is-up-to-date@v2 with: - fetch-depth: 0 - fetch-tags: true + branc: master + tags: ${{ github.head_ref }} + # For merge queue check - name: Check pull-request up to date + if: github.event_name != 'pull_request' uses: Automattic/action-pr-is-up-to-date@v2 with: branc: master + tags: ${{ github.event.merge_group.head_ref }} diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 1241887a85b..adcfe231182 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -24,18 +24,6 @@ jobs: timeout-minutes: 10 container: ros:humble steps: - - name: Get pull request number - uses: KyoriPowered/action-regex-match@v3 - id: get_pull_request_number - with: - text: ${{ github.event.merge_group.head_ref }} - regex: 'master/pr-([0-9]+)' - - name: Get branch name based on pull request ID - uses: andrevalentin/get-branch-name-by-pr@v1 - id: pr_data - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - pr-id: ${{ steps.get_pull_request_number.outputs.group1 }} - name: install bloom run: apt update && apt install -y python3-bloom git - name: checkout @@ -50,30 +38,20 @@ jobs: git config --global user.email "ms.kataoka@gmail.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 git config --global credential.helper ${{ secrets.BLOOM_GITHUB_TOKEN }} - - name: Merge branch - run: git pull origin ${{ github.event.merge_group.head_ref }} - - name: Get labels of the pull request - id: get_label - uses: fml09/get-label@v0.1.1 - with: - pull_number: ${{ steps.get_pull_request_number.outputs.group1 }} - repo: scenario_simulator_v2 - owner: merge-queue-testing - token: ${{ secrets.GITHUB_TOKEN }} - name: bump patch version - if: contains(steps.get_label.outputs.labels, 'bump patch') + if: contains(github.event.pull_request.labels.*.name, 'bump patch') run: | catkin_generate_changelog -y catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: bump minor version - if: contains(steps.get_label.outputs.labels, 'bump minor') + if: contains(github.event.pull_request.labels.*.name, 'bump minor') run: | catkin_generate_changelog -y catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: bump major version - if: contains(steps.get_label.outputs.labels, 'bump major') + if: contains(github.event.pull_request.labels.*.name, 'bump major') run: | catkin_generate_changelog -y catkin_tag_changelog --bump major From 6b20e4deb79b297dd96bfb40bb11b87906addc85 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 15:19:00 +0900 Subject: [PATCH 109/245] use bash action Signed-off-by: Masaya Kataoka --- .github/workflows/CheckBranchUpToDate.yaml | 24 +++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/CheckBranchUpToDate.yaml b/.github/workflows/CheckBranchUpToDate.yaml index a8917e7cf78..744104afbd2 100644 --- a/.github/workflows/CheckBranchUpToDate.yaml +++ b/.github/workflows/CheckBranchUpToDate.yaml @@ -12,17 +12,13 @@ jobs: timeout-minutes: 10 runs-on: ubuntu-22.04 steps: - # For pull requet check - - name: Check pull-request up to date - if: github.event_name == 'pull_request' - uses: Automattic/action-pr-is-up-to-date@v2 - with: - branc: master - tags: ${{ github.head_ref }} - # For merge queue check - - name: Check pull-request up to date - if: github.event_name != 'pull_request' - uses: Automattic/action-pr-is-up-to-date@v2 - with: - branc: master - tags: ${{ github.event.merge_group.head_ref }} + - name: Check if branches are up to date + shell: bash + run: | + BASE=$(git merge-base origin/master HEAD) + if [ $BASE = $(git rev-parse origin/master) ]; then + echo "Branches are up to date, skipping merge." + else + echo "Branches are not up to date, merge is required." + exit 1 + fi From 949188100ca7b4b1249671ccdd3039e7ba629a22 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 15:20:33 +0900 Subject: [PATCH 110/245] add checkout step Signed-off-by: Masaya Kataoka --- .github/workflows/CheckBranchUpToDate.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/CheckBranchUpToDate.yaml b/.github/workflows/CheckBranchUpToDate.yaml index 744104afbd2..b419f22ffc1 100644 --- a/.github/workflows/CheckBranchUpToDate.yaml +++ b/.github/workflows/CheckBranchUpToDate.yaml @@ -12,6 +12,11 @@ jobs: timeout-minutes: 10 runs-on: ubuntu-22.04 steps: + - name: checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + fetch-tags: true - name: Check if branches are up to date shell: bash run: | From 3dccb946e1b7868365bbe4b4ff50c1bfea389d24 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 15:24:52 +0900 Subject: [PATCH 111/245] use force push Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index adcfe231182..caad9fa97ec 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -60,5 +60,5 @@ jobs: run: | git add . git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" - git push + git push -f working-directory: scenario_simulator_v2 From 0aaa0e6e571fa87c5038c4012f7827d135d3fce0 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 15:25:22 +0900 Subject: [PATCH 112/245] update commit message Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index caad9fa97ec..6996817cdd4 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -59,6 +59,6 @@ jobs: - name: commit changes run: | git add . - git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" + git commit -m "[Bot] Bump version of scenario_simulator_v2 to version $(catkin_package_version)" git push -f working-directory: scenario_simulator_v2 From f29ed2e884dcd5049e68a2e43ce3ef6fd462eb55 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 15:34:13 +0900 Subject: [PATCH 113/245] use CasperWA/push-protected@v2 Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 6996817cdd4..cb79f5b571f 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -60,5 +60,9 @@ jobs: run: | git add . git commit -m "[Bot] Bump version of scenario_simulator_v2 to version $(catkin_package_version)" - git push -f working-directory: scenario_simulator_v2 + - name: Pushing to the protected branch 'protected' + uses: CasperWA/push-protected@v2 + with: + token: ${{ secrets.BLOOM_GITHUB_TOKEN }} + branch: master \ No newline at end of file From 5b66472b2aa9d9b0b8a848c95e5ef2496437a129 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 15:34:59 +0900 Subject: [PATCH 114/245] add white line at EoF Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index cb79f5b571f..98f4e3e6251 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -65,4 +65,4 @@ jobs: uses: CasperWA/push-protected@v2 with: token: ${{ secrets.BLOOM_GITHUB_TOKEN }} - branch: master \ No newline at end of file + branch: master From 77d26ed8cdf2b6e9dd24fe25b90429659858de33 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 06:59:32 +0000 Subject: [PATCH 115/245] [Bot] Bump version of scenario_simulator_v2 to version 0.8.1 --- scenario_simulator_v2/CHANGELOG.rst | 30 +++++++++++++++++++++++++++-- scenario_simulator_v2/package.xml | 2 +- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 2148962eb5c..46ad338a60d 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,8 +2,34 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-22) +------------------ +* Merge pull request `#10 `_ from merge-queue-testing/feature/bump_version_action + add trigger +* fix changelog +* update CHANGELOG +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* bump version of scenario_simulator_v2. +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + * Merge pull request `#10 `_ from hakuturu583/test/release update CHANGELOG * update CHANGELOG diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c49ab6f3033..c456a27a948 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.0 + 0.8.1 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 From 798b55ade509d3393fe7fcf06efa28aea59b966f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 16:43:37 +0900 Subject: [PATCH 116/245] update Release Action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 52 +++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 98f4e3e6251..b4bfd7984bd 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -3,11 +3,11 @@ on: pull_request: branches: - master - types: [closed] + merge_group: + types: [checks_requested] jobs: release: - if: github.event.pull_request.merged == true name: Release runs-on: ubuntu-22.04 permissions: @@ -24,45 +24,75 @@ jobs: timeout-minutes: 10 container: ros:humble steps: + - name: Get pull request number + uses: KyoriPowered/action-regex-match@v3 + if: ${{ github.event_name != 'pull_request' }} + id: get_pull_request_number + with: + text: ${{ github.event.merge_group.head_ref }} + regex: 'master/pr-([0-9]+)' + - name: Get branch name based on pull request ID + if: ${{ github.event_name != 'pull_request' }} + uses: andrevalentin/get-branch-name-by-pr@v1 + id: pr_data + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + pr-id: ${{ steps.get_pull_request_number.outputs.group1 }} - name: install bloom + if: ${{ github.event_name != 'pull_request' }} run: apt update && apt install -y python3-bloom git - name: checkout uses: actions/checkout@v2 + if: ${{ github.event_name != 'pull_request' }} with: - ref: master + ref: ${{ steps.pr_data.outputs.branch }} fetch-depth: 0 fetch-tags: true - name: Setup git user + if: ${{ github.event_name != 'pull_request' }} run: | - git config --global user.name "Masaya Kataoka" - git config --global user.email "ms.kataoka@gmail.com" + git config --global user.name "Release Bot" + git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - git config --global credential.helper ${{ secrets.BLOOM_GITHUB_TOKEN }} + git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} + - name: Merge branch + if: ${{ github.event_name != 'pull_request' }} + run: git pull origin ${{ github.event.merge_group.head_ref }} + - name: Get labels of the pull request + if: ${{ github.event_name != 'pull_request' }} + id: get_label + uses: fml09/get-label@v0.1.1 + with: + pull_number: ${{ steps.get_pull_request_number.outputs.group1 }} + repo: scenario_simulator_v2 + owner: merge-queue-testing + token: ${{ secrets.GITHUB_TOKEN }} - name: bump patch version - if: contains(github.event.pull_request.labels.*.name, 'bump patch') + if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump patch')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: bump minor version - if: contains(github.event.pull_request.labels.*.name, 'bump minor') + if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump minor')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: bump major version - if: contains(github.event.pull_request.labels.*.name, 'bump major') + if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump major')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major - name: commit changes + if: ${{ github.event_name != 'pull_request' }} run: | git add . - git commit -m "[Bot] Bump version of scenario_simulator_v2 to version $(catkin_package_version)" + git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" working-directory: scenario_simulator_v2 - name: Pushing to the protected branch 'protected' uses: CasperWA/push-protected@v2 with: token: ${{ secrets.BLOOM_GITHUB_TOKEN }} - branch: master + branch: ${{ github.event.merge_group.head_ref }} From e46b3696b839e7fa5657444b8bbee24efa10468a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 16:51:24 +0900 Subject: [PATCH 117/245] add if Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index b4bfd7984bd..38b8c56ab87 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -92,6 +92,7 @@ jobs: git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" working-directory: scenario_simulator_v2 - name: Pushing to the protected branch 'protected' + if: ${{ github.event_name != 'pull_request' }} uses: CasperWA/push-protected@v2 with: token: ${{ secrets.BLOOM_GITHUB_TOKEN }} From b403b0451d3ee1156ac482c2c0aa0572b2dd0ea6 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 17:19:12 +0900 Subject: [PATCH 118/245] fix version Signed-off-by: Masaya Kataoka --- scenario_simulator_v2/CHANGELOG.rst | 4 ++-- scenario_simulator_v2/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 46ad338a60d..9b3f9e821a8 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -0.8.1 (2024-01-22) ------------------- +Forthcoming +----------- * Merge pull request `#10 `_ from merge-queue-testing/feature/bump_version_action add trigger * fix changelog diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c456a27a948..c49ab6f3033 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.1 + 0.8.0 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 From 836f00e98a15696d433ebd1b5358871dc4dd0f51 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 22 Jan 2024 17:22:39 +0900 Subject: [PATCH 119/245] change push target branch Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 38b8c56ab87..fa58d8aa9e6 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -96,4 +96,4 @@ jobs: uses: CasperWA/push-protected@v2 with: token: ${{ secrets.BLOOM_GITHUB_TOKEN }} - branch: ${{ github.event.merge_group.head_ref }} + branch: ${{ steps.pr_data.outputs.branch }} From 2bec457e023257b4b6e0ba4a364b85dc95062fee Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 13:03:52 +0900 Subject: [PATCH 120/245] fix release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 106 ++++++++++++++++++++++++--------- 1 file changed, 78 insertions(+), 28 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index fa58d8aa9e6..b1d95b02f0e 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -7,9 +7,80 @@ on: types: [checks_requested] jobs: + try_release: + name: Try Release + runs-on: ubuntu-22.04 + if: ${{ github.event_name != 'pull_request' }} + timeout-minutes: 10 + container: ros:humble + steps: + - name: install bloom + run: apt update && apt install -y python3-bloom git + - name: checkout + uses: actions/checkout@v2 + with: + ref: master + fetch-depth: 0 + fetch-tags: true + - name: Setup git user + run: | + git config --global user.name "Release Bot" + git config --global user.email "action@github.com" + git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 + git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} + - name: Merge branch + run: git pull origin ${{ github.event.merge_group.head_ref }} + # Get infomration of the pull request. + - name: Get pull request number + uses: KyoriPowered/action-regex-match@v3 + id: get_pull_request_number + with: + text: ${{ github.event.merge_group.head_ref }} + regex: 'master/pr-([0-9]+)' + - name: Get branch name based on pull request ID + uses: andrevalentin/get-branch-name-by-pr@v1 + id: pr_data + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + pr-id: ${{ steps.get_pull_request_number.outputs.group1 }} + - name: Get labels of the pull request + id: get_label + uses: fml09/get-label@v0.1.1 + with: + pull_number: ${{ steps.get_pull_request_number.outputs.group1 }} + repo: scenario_simulator_v2 + owner: merge-queue-testing + token: ${{ secrets.GITHUB_TOKEN }} + - name: Get labels of the pull request + id: get_label + uses: fml09/get-label@v0.1.1 + with: + pull_number: ${{ steps.get_pull_request_number.outputs.group1 }} + repo: scenario_simulator_v2 + owner: merge-queue-testing + token: ${{ secrets.GITHUB_TOKEN }} + - name: bump patch version + if: (contains(steps.get_label.outputs.labels, 'bump patch')) + run: | + catkin_generate_changelog -y + catkin_tag_changelog --bump patch + catkin_package_version --bump patch + - name: bump minor version + if: (contains(steps.get_label.outputs.labels, 'bump minor')) + run: | + catkin_generate_changelog -y + catkin_tag_changelog --bump minor + catkin_package_version --bump minor + - name: bump major version + if: (contains(steps.get_label.outputs.labels, 'bump major')) + run: | + catkin_generate_changelog -y + catkin_tag_changelog --bump major + catkin_package_version --bump major release: name: Release runs-on: ubuntu-22.04 + if: github.event.pull_request.merged == true permissions: actions: write checks: write @@ -24,42 +95,23 @@ jobs: timeout-minutes: 10 container: ros:humble steps: - - name: Get pull request number - uses: KyoriPowered/action-regex-match@v3 - if: ${{ github.event_name != 'pull_request' }} - id: get_pull_request_number - with: - text: ${{ github.event.merge_group.head_ref }} - regex: 'master/pr-([0-9]+)' - - name: Get branch name based on pull request ID - if: ${{ github.event_name != 'pull_request' }} - uses: andrevalentin/get-branch-name-by-pr@v1 - id: pr_data - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - pr-id: ${{ steps.get_pull_request_number.outputs.group1 }} - name: install bloom - if: ${{ github.event_name != 'pull_request' }} run: apt update && apt install -y python3-bloom git - name: checkout uses: actions/checkout@v2 - if: ${{ github.event_name != 'pull_request' }} with: - ref: ${{ steps.pr_data.outputs.branch }} + ref: master fetch-depth: 0 fetch-tags: true - name: Setup git user - if: ${{ github.event_name != 'pull_request' }} run: | git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} - name: Merge branch - if: ${{ github.event_name != 'pull_request' }} - run: git pull origin ${{ github.event.merge_group.head_ref }} + run: git pull origin ${{ github.head_ref }} - name: Get labels of the pull request - if: ${{ github.event_name != 'pull_request' }} id: get_label uses: fml09/get-label@v0.1.1 with: @@ -68,32 +120,30 @@ jobs: owner: merge-queue-testing token: ${{ secrets.GITHUB_TOKEN }} - name: bump patch version - if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump patch')) + if: (contains(github.event.pull_request.labels.*.name, 'bump patch')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: bump minor version - if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump minor')) + if: (contains(github.event.pull_request.labels.*.name, 'bump minor')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: bump major version - if: github.event_name != 'pull_request' && (contains(steps.get_label.outputs.labels, 'bump major')) + if: (contains(github.event.pull_request.labels.*.name, 'bump major')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major - name: commit changes - if: ${{ github.event_name != 'pull_request' }} run: | git add . git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" working-directory: scenario_simulator_v2 - - name: Pushing to the protected branch 'protected' - if: ${{ github.event_name != 'pull_request' }} + - name: Pushing to the protected branch 'master' uses: CasperWA/push-protected@v2 with: token: ${{ secrets.BLOOM_GITHUB_TOKEN }} - branch: ${{ steps.pr_data.outputs.branch }} + branch: master From 377605b8506f99fbfa74a9db9b0eb4532fbbeb49 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 13:10:02 +0900 Subject: [PATCH 121/245] fix release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index b1d95b02f0e..bb6f491270b 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -3,14 +3,11 @@ on: pull_request: branches: - master - merge_group: - types: [checks_requested] jobs: try_release: name: Try Release runs-on: ubuntu-22.04 - if: ${{ github.event_name != 'pull_request' }} timeout-minutes: 10 container: ros:humble steps: @@ -29,28 +26,7 @@ jobs: git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} - name: Merge branch - run: git pull origin ${{ github.event.merge_group.head_ref }} - # Get infomration of the pull request. - - name: Get pull request number - uses: KyoriPowered/action-regex-match@v3 - id: get_pull_request_number - with: - text: ${{ github.event.merge_group.head_ref }} - regex: 'master/pr-([0-9]+)' - - name: Get branch name based on pull request ID - uses: andrevalentin/get-branch-name-by-pr@v1 - id: pr_data - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - pr-id: ${{ steps.get_pull_request_number.outputs.group1 }} - - name: Get labels of the pull request - id: get_label - uses: fml09/get-label@v0.1.1 - with: - pull_number: ${{ steps.get_pull_request_number.outputs.group1 }} - repo: scenario_simulator_v2 - owner: merge-queue-testing - token: ${{ secrets.GITHUB_TOKEN }} + run: git pull origin ${{ github.head_ref }} - name: Get labels of the pull request id: get_label uses: fml09/get-label@v0.1.1 @@ -60,19 +36,19 @@ jobs: owner: merge-queue-testing token: ${{ secrets.GITHUB_TOKEN }} - name: bump patch version - if: (contains(steps.get_label.outputs.labels, 'bump patch')) + if: (contains(github.event.pull_request.labels.*.name, 'bump patch')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump patch catkin_package_version --bump patch - name: bump minor version - if: (contains(steps.get_label.outputs.labels, 'bump minor')) + if: (contains(github.event.pull_request.labels.*.name, 'bump minor')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump minor catkin_package_version --bump minor - name: bump major version - if: (contains(steps.get_label.outputs.labels, 'bump major')) + if: (contains(github.event.pull_request.labels.*.name, 'bump major')) run: | catkin_generate_changelog -y catkin_tag_changelog --bump major From 73497443ea01c6600a479490caa0ead3fd60be3f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 13:18:16 +0900 Subject: [PATCH 122/245] configure trigger Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index bb6f491270b..fb851b9fd4b 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -3,6 +3,7 @@ on: pull_request: branches: - master + types: [closed, edited] jobs: try_release: From 4c41d73a27870883f454cd6982f04e8076d4ca67 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 13:20:17 +0900 Subject: [PATCH 123/245] empty commit Signed-off-by: Masaya Kataoka From 7e92f3d286b7ac1284e8efb029a8e5a59c32340e Mon Sep 17 00:00:00 2001 From: Release Bot Date: Tue, 23 Jan 2024 04:24:43 +0000 Subject: [PATCH 124/245] Bump version of scenario_simulator_v2 to version 0.8.1 --- scenario_simulator_v2/CHANGELOG.rst | 32 +++++++++++++++++++++++++++-- scenario_simulator_v2/package.xml | 2 +- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 9b3f9e821a8..122dafed8a5 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,8 +2,36 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-23) +------------------ +* fix version +* [Bot] Bump version of scenario_simulator_v2 to version 0.8.1 +* Merge pull request `#10 `_ from merge-queue-testing/feature/bump_version_action + add trigger +* fix changelog +* update CHANGELOG +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* bump version of scenario_simulator_v2. +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + * Merge pull request `#10 `_ from merge-queue-testing/feature/bump_version_action add trigger * fix changelog diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c49ab6f3033..c456a27a948 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.0 + 0.8.1 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 From 7a45217786dc1057d48d2745970f107dba77786c Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 13:49:07 +0900 Subject: [PATCH 125/245] add conculency and modify commit message Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index fb851b9fd4b..2620a817b8a 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -4,6 +4,7 @@ on: branches: - master types: [closed, edited] +concurrency: release jobs: try_release: @@ -86,6 +87,10 @@ jobs: git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} + - name: Get old version + id: old_version + run: | + echo "old_version=$(catkin_package_version)" >> $GITHUB_OUTPUT - name: Merge branch run: git pull origin ${{ github.head_ref }} - name: Get labels of the pull request @@ -117,7 +122,7 @@ jobs: - name: commit changes run: | git add . - git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" + git commit -m "Bump version of scenario_simulator_v2 from version ${{ steps.old_version.outputs.old_version }} to version $(catkin_package_version)" working-directory: scenario_simulator_v2 - name: Pushing to the protected branch 'master' uses: CasperWA/push-protected@v2 From d894d591291e815dc571f2a426ce5a52fa1913a0 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 13:52:05 +0900 Subject: [PATCH 126/245] fix trigger Signed-off-by: Masaya Kataoka --- .github/workflows/CheckLabel.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/CheckLabel.yaml b/.github/workflows/CheckLabel.yaml index 6c562d59483..9ad7200d382 100644 --- a/.github/workflows/CheckLabel.yaml +++ b/.github/workflows/CheckLabel.yaml @@ -7,6 +7,8 @@ on: types: - created - edited + - labeled + - unlabeled jobs: check_label: From 67decd9a2f72b38942e6e52278d2f5c258200e44 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 13:54:13 +0900 Subject: [PATCH 127/245] modify trigger Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 2620a817b8a..b6728cb1a1e 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -3,7 +3,7 @@ on: pull_request: branches: - master - types: [closed, edited] + types: [closed, edited, opened, synchronize, reopened] concurrency: release jobs: From e3db5d2f0f1fc8a5c566732c13cf7c4f400574ef Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 13:55:14 +0900 Subject: [PATCH 128/245] fix trigger Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index b6728cb1a1e..cf7162467e8 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -3,7 +3,15 @@ on: pull_request: branches: - master - types: [closed, edited, opened, synchronize, reopened] + types: + - closed + - created + - edited + - labeled + - opened + - reopened + - synchronize + - unlabeled concurrency: release jobs: From 881140c69c2751e1a5d70ec5f6631dad1851508a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 13:56:46 +0900 Subject: [PATCH 129/245] empty commit Signed-off-by: Masaya Kataoka From 27c4aa0fb1cbfd694330e2fba934bc72af687e5b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 16:05:50 +0900 Subject: [PATCH 130/245] fix git setting Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index cf7162467e8..fe4f9d7597b 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -29,12 +29,13 @@ jobs: ref: master fetch-depth: 0 fetch-tags: true - - name: Setup git user + - name: Setup git run: | git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} + git config pull.rebase false - name: Merge branch run: git pull origin ${{ github.head_ref }} - name: Get labels of the pull request @@ -89,12 +90,13 @@ jobs: ref: master fetch-depth: 0 fetch-tags: true - - name: Setup git user + - name: Setup git run: | git config --global user.name "Release Bot" git config --global user.email "action@github.com" git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} + git config pull.rebase false - name: Get old version id: old_version run: | From a79be9f5cad1534706dd2f1d5af1c87fe7db490c Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 16:11:52 +0900 Subject: [PATCH 131/245] fix version Signed-off-by: Masaya Kataoka --- scenario_simulator_v2/CHANGELOG.rst | 4 ++-- scenario_simulator_v2/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 122dafed8a5..c2ed42d6820 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -0.8.1 (2024-01-23) ------------------- +Forthcoming +----------- * fix version * [Bot] Bump version of scenario_simulator_v2 to version 0.8.1 * Merge pull request `#10 `_ from merge-queue-testing/feature/bump_version_action diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c456a27a948..c49ab6f3033 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.1 + 0.8.0 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 From 6ba93dcdb8de01f81a336e597ca833d3b90dd24b Mon Sep 17 00:00:00 2001 From: Release Bot Date: Tue, 23 Jan 2024 07:14:57 +0000 Subject: [PATCH 132/245] Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 --- scenario_simulator_v2/CHANGELOG.rst | 37 +++++++++++++++++++++++++++-- scenario_simulator_v2/package.xml | 2 +- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index c2ed42d6820..050594bd728 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,8 +2,41 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-23) +------------------ +* Merge pull request `#17 `_ from merge-queue-testing/fix/release + add conculency and modify commit message +* fix version +* Merge remote-tracking branch 'test/master' into fix/release +* Bump version of scenario_simulator_v2 to version 0.8.1 +* fix version +* [Bot] Bump version of scenario_simulator_v2 to version 0.8.1 +* Merge pull request `#10 `_ from merge-queue-testing/feature/bump_version_action + add trigger +* fix changelog +* update CHANGELOG +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* bump version of scenario_simulator_v2. +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + * fix version * [Bot] Bump version of scenario_simulator_v2 to version 0.8.1 * Merge pull request `#10 `_ from merge-queue-testing/feature/bump_version_action diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c49ab6f3033..c456a27a948 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.0 + 0.8.1 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 From 04f02114af3976fd8982fca77c03f58e97c3959a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 16:22:32 +0900 Subject: [PATCH 133/245] simplify action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 51 ++-------------------------------- 1 file changed, 2 insertions(+), 49 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index fb851b9fd4b..f6592c68f6c 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -6,58 +6,9 @@ on: types: [closed, edited] jobs: - try_release: - name: Try Release - runs-on: ubuntu-22.04 - timeout-minutes: 10 - container: ros:humble - steps: - - name: install bloom - run: apt update && apt install -y python3-bloom git - - name: checkout - uses: actions/checkout@v2 - with: - ref: master - fetch-depth: 0 - fetch-tags: true - - name: Setup git user - run: | - git config --global user.name "Release Bot" - git config --global user.email "action@github.com" - git config --global --add safe.directory /__w/scenario_simulator_v2/scenario_simulator_v2 - git config --global credential.helper ${{ secrets.GITHUB_TOKEN }} - - name: Merge branch - run: git pull origin ${{ github.head_ref }} - - name: Get labels of the pull request - id: get_label - uses: fml09/get-label@v0.1.1 - with: - pull_number: ${{ steps.get_pull_request_number.outputs.group1 }} - repo: scenario_simulator_v2 - owner: merge-queue-testing - token: ${{ secrets.GITHUB_TOKEN }} - - name: bump patch version - if: (contains(github.event.pull_request.labels.*.name, 'bump patch')) - run: | - catkin_generate_changelog -y - catkin_tag_changelog --bump patch - catkin_package_version --bump patch - - name: bump minor version - if: (contains(github.event.pull_request.labels.*.name, 'bump minor')) - run: | - catkin_generate_changelog -y - catkin_tag_changelog --bump minor - catkin_package_version --bump minor - - name: bump major version - if: (contains(github.event.pull_request.labels.*.name, 'bump major')) - run: | - catkin_generate_changelog -y - catkin_tag_changelog --bump major - catkin_package_version --bump major release: name: Release runs-on: ubuntu-22.04 - if: github.event.pull_request.merged == true permissions: actions: write checks: write @@ -115,11 +66,13 @@ jobs: catkin_tag_changelog --bump major catkin_package_version --bump major - name: commit changes + if: github.event.pull_request.merged == true run: | git add . git commit -m "Bump version of scenario_simulator_v2 to version $(catkin_package_version)" working-directory: scenario_simulator_v2 - name: Pushing to the protected branch 'master' + if: github.event.pull_request.merged == true uses: CasperWA/push-protected@v2 with: token: ${{ secrets.BLOOM_GITHUB_TOKEN }} From afe840b05aeb22aa3b3287aed0c2aa06a149f477 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 16:51:15 +0900 Subject: [PATCH 134/245] fix changelog Signed-off-by: Masaya Kataoka --- scenario_simulator_v2/CHANGELOG.rst | 4 ++-- scenario_simulator_v2/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 050594bd728..63082cc87ab 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -0.8.1 (2024-01-23) ------------------- +Forthcoming +----------- * Merge pull request `#17 `_ from merge-queue-testing/fix/release add conculency and modify commit message * fix version diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c456a27a948..c49ab6f3033 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.1 + 0.8.0 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 From f3d2fe10c2f774cdd447382e7b7e2f5ca56ef1b6 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 16:52:53 +0900 Subject: [PATCH 135/245] fix CHANGELOG Signed-off-by: Masaya Kataoka --- scenario_simulator_v2/CHANGELOG.rst | 4 ++-- scenario_simulator_v2/package.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 050594bd728..63082cc87ab 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,8 +2,8 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -0.8.1 (2024-01-23) ------------------- +Forthcoming +----------- * Merge pull request `#17 `_ from merge-queue-testing/fix/release add conculency and modify commit message * fix version diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c456a27a948..c49ab6f3033 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.1 + 0.8.0 scenario testing framework for Autoware Masaya Kataoka Apache License 2.0 From 51d73435e9b23da5b2702ca58a92f827db84cdec Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 16:55:59 +0900 Subject: [PATCH 136/245] fix working directory Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 22350d7f066..3725d555c7d 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -84,7 +84,6 @@ jobs: run: | git add . git commit -m "Bump version of scenario_simulator_v2 from version ${{ steps.old_version.outputs.old_version }} to version $(catkin_package_version)" - working-directory: scenario_simulator_v2 - name: Pushing to the protected branch 'master' if: github.event.pull_request.merged == true uses: CasperWA/push-protected@v2 From b65be98413f038dd7741a3d30ae5b01d8be56887 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 17:04:29 +0900 Subject: [PATCH 137/245] fix release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 3725d555c7d..414a3cb9f2c 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -88,5 +88,10 @@ jobs: if: github.event.pull_request.merged == true uses: CasperWA/push-protected@v2 with: - token: ${{ secrets.BLOOM_GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} branch: master + - name: delete branch + if: github.event.pull_request.merged == true + uses: SvanBoxel/delete-merged-branch@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 75c9c2e1018f65f753aeabffa77412ef66b7ba2a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 17:05:49 +0900 Subject: [PATCH 138/245] enable delete automatically Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 414a3cb9f2c..28a842cbf04 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -94,4 +94,4 @@ jobs: if: github.event.pull_request.merged == true uses: SvanBoxel/delete-merged-branch@main env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 68c5e7be8e88517032b4ce622a9acae196d60a20 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 17:09:01 +0900 Subject: [PATCH 139/245] add restore branch step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 28a842cbf04..a318a6408df 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -51,6 +51,8 @@ jobs: id: old_version run: | echo "old_version=$(catkin_package_version)" >> $GITHUB_OUTPUT + - name: Restore branch + uses: levonet/action-restore-branch@master - name: Merge branch run: git pull origin ${{ github.head_ref }} - name: Get labels of the pull request @@ -90,8 +92,3 @@ jobs: with: token: ${{ secrets.GITHUB_TOKEN }} branch: master - - name: delete branch - if: github.event.pull_request.merged == true - uses: SvanBoxel/delete-merged-branch@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 014afbf9f8434ea8560020a1f28aa2067ac67a5d Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 17:15:04 +0900 Subject: [PATCH 140/245] add force = true Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 3725d555c7d..d077fbdc31c 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -90,3 +90,4 @@ jobs: with: token: ${{ secrets.BLOOM_GITHUB_TOKEN }} branch: master + force: true From dedbc6b60709b2f485fbe8081a6513d14e20e763 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 17:22:15 +0900 Subject: [PATCH 141/245] add delete step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index d077fbdc31c..a270adfd83e 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -91,3 +91,8 @@ jobs: token: ${{ secrets.BLOOM_GITHUB_TOKEN }} branch: master force: true + - name: Delete branch + if: github.event.pull_request.merged == true + uses: SvanBoxel/delete-merged-branch@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From af009f53af7f8589faa507ab1f05844d368691f4 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Tue, 23 Jan 2024 17:23:05 +0900 Subject: [PATCH 142/245] fix action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 0d99999dc93..02d0ffd0220 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -51,8 +51,6 @@ jobs: id: old_version run: | echo "old_version=$(catkin_package_version)" >> $GITHUB_OUTPUT - - name: Restore branch - uses: levonet/action-restore-branch@master - name: Merge branch run: git pull origin ${{ github.head_ref }} - name: Get labels of the pull request @@ -94,7 +92,6 @@ jobs: branch: master force: true - name: Delete branch - if: github.event.pull_request.merged == true uses: SvanBoxel/delete-merged-branch@main env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From dde8c62b43c512d8a61d3e6d0f2c0833afd95087 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 12:22:27 +0900 Subject: [PATCH 143/245] use admin token in push Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 02d0ffd0220..344a9d19259 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -88,7 +88,7 @@ jobs: if: github.event.pull_request.merged == true uses: CasperWA/push-protected@v2 with: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.BLOOM_GITHUB_TOKEN }} branch: master force: true - name: Delete branch From 92e50edd3e653472a06bab6d6432c5e4bbe98c22 Mon Sep 17 00:00:00 2001 From: Release Bot Date: Wed, 24 Jan 2024 03:26:24 +0000 Subject: [PATCH 144/245] Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 --- common/math/arithmetic/CHANGELOG.rst | 26 +- common/math/arithmetic/package.xml | 2 +- common/math/geometry/CHANGELOG.rst | 153 +++++++++- common/math/geometry/package.xml | 2 +- .../CHANGELOG.rst | 40 ++- .../scenario_simulator_exception/package.xml | 2 +- common/simple_junit/CHANGELOG.rst | 36 ++- common/simple_junit/package.xml | 2 +- common/status_monitor/CHANGELOG.rst | 25 +- common/status_monitor/package.xml | 2 +- external/concealer/CHANGELOG.rst | 151 +++++++++- external/concealer/package.xml | 2 +- map/kashiwanoha_map/CHANGELOG.rst | 25 +- map/kashiwanoha_map/package.xml | 2 +- mock/cpp_mock_scenarios/CHANGELOG.rst | 104 ++++++- mock/cpp_mock_scenarios/package.xml | 2 +- .../CHANGELOG.rst | 32 ++- .../package.xml | 2 +- .../openscenario_interpreter/CHANGELOG.rst | 162 ++++++++++- .../openscenario_interpreter/package.xml | 2 +- .../CHANGELOG.rst | 25 +- .../package.xml | 2 +- .../CHANGELOG.rst | 25 +- .../openscenario_interpreter_msgs/package.xml | 2 +- .../openscenario_preprocessor/CHANGELOG.rst | 35 ++- .../openscenario_preprocessor/package.xml | 2 +- .../CHANGELOG.rst | 29 +- .../package.xml | 2 +- .../openscenario_utility/CHANGELOG.rst | 25 +- openscenario/openscenario_utility/package.xml | 2 +- .../openscenario_visualization/CHANGELOG.rst | 25 +- .../openscenario_visualization/package.xml | 2 +- scenario_simulator_v2/CHANGELOG.rst | 41 ++- scenario_simulator_v2/package.xml | 2 +- simulation/behavior_tree_plugin/CHANGELOG.rst | 94 ++++++- simulation/behavior_tree_plugin/package.xml | 2 +- simulation/do_nothing_plugin/CHANGELOG.rst | 66 ++++- simulation/do_nothing_plugin/package.xml | 2 +- .../simple_sensor_simulator/CHANGELOG.rst | 137 ++++++++- .../simple_sensor_simulator/package.xml | 2 +- simulation/simulation_interface/CHANGELOG.rst | 90 +++++- simulation/simulation_interface/package.xml | 2 +- simulation/traffic_simulator/CHANGELOG.rst | 263 +++++++++++++++++- simulation/traffic_simulator/package.xml | 2 +- .../traffic_simulator_msgs/CHANGELOG.rst | 31 ++- simulation/traffic_simulator_msgs/package.xml | 2 +- test_runner/random_test_runner/CHANGELOG.rst | 74 ++++- test_runner/random_test_runner/package.xml | 2 +- .../scenario_test_runner/CHANGELOG.rst | 144 +++++++++- test_runner/scenario_test_runner/package.xml | 2 +- 50 files changed, 1833 insertions(+), 75 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 88e9f358514..b82939f76f7 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -2,8 +2,30 @@ Changelog for package arithmetic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + * Merge branch 'master' into feature/freespace-distance-condition * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection * Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index b509f34a56c..1ff0903809a 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.0 + 0.8.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 14335d6653f..9811aedaca8 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -2,8 +2,157 @@ Changelog for package geometry ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge pull request `#1102 `_ from tier4/fix/wrong_distance + Change possibly wrong subtraction of distance calculation to assignment +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Change subtraction to assignment +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1019 `_ from tier4/feature/fallback_spline_to_line_segments + Feature/fallback spline to line segments +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* fix case +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix format +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* fix typo +* add torelance +* fix getSValue function in line segment class +* add getSValue function +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* use auto +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* add member initializer +* add test case +* fix problem in total_length in CatmullRomSpline class +* use push_back +* add comment +* update comment +* add comment +* fix comment +* fix typo +* add white line +* add white line +* fix typo +* fix typo +* remove plot +* add comment +* udpate comment +* add comment +* add comment +* apply reformat +* update comment +* add gnupolot files +* update comment +* fix comment +* update if +* add comment +* add comment +* add auto scale +* add test case +* fix denormalize +* add comment +* add comment +* add comment +* use auto and -> +* use & +* use auto -> +* remove unused header +* use auto and -> +* add const +* update comment +* add description +* care edge case +* simplify code +* update comment +* update comment +* update comment +* fix typo +* add error message +* add comment +* add test case +* add comment +* add comment +* add comment +* add test case +* update test case +* remove unused function +* add autoscale to the line segment +* update description +* add description +* fix autoscale feature +* add comment +* fix typo +* enable fallback for each functions +* fix some of member function +* add white line for visibility +* add message +* add comment +* remove unused line +* add comment +* add comments +* add comment +* add comment +* add comment +* add test case +* add test case +* add docs +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* add test case +* add test case +* add test case +* fix calculate s value +* fix getLineSegments function +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* enable check collision to the point +* add functions +* simplify code +* add const +* use lambda +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Shota Minami, Tatsuya Yamasaki, yamacir-kit + * Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index c3deb9b3604..4b807f3d0f8 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.0 + 0.8.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 eebdb824cb3..7cb42fe14c4 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -2,8 +2,44 @@ Changelog for package scenario_simulator_exception ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* add define error category +* add SpecificationViolation +* update Doxyfile +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* ref(openscenario_interpreter): revert comments format +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(openscenario_interpreter): inherit ScenarioFailure and tidy up +* feat(openscenario_interpreter): mv ScenarioError, add catch InitActions +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(openscenario_interpreter): improve exception for detail result msg +* feat(openscenario_interpreter): first step detail result msg +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + * Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence # Conflicts: # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 8d77216275b..3a4969a254e 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.0 + 0.8.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 c55c0d8a46e..88e07d6aa2f 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -2,8 +2,40 @@ Changelog for package junit_exporter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* fix typo +* update Doxyfile +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + * Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence # Conflicts: # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 2f07b166c8e..dccf4679e8b 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.0 + 0.8.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 e7520220aa4..1bf7ec75d35 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -2,8 +2,29 @@ Changelog for package status_monitor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + * Merge branch 'master' into feature/freespace-distance-condition * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection * Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 72cdb9598da..177494b81f2 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.0 + 0.8.1 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index 45e6ec8baea..94506804d44 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -2,8 +2,155 @@ Changelog for package concealer ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* update Doxyfile +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#1106 `_ from tier4/fix/rtc_command_action/continuous_execution + Fix/rtc command action/continuous execution +* Merge pull request `#997 `_ from tier4/feature/allow-goal-modification + Feature/allow goal modification +* doc(concealer): add notes for RTC used status filter +* refactor: service_with_validation.hpp +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* refactor(concealer): delete debug print +* chore(concealer): delete unnecessary line break +* chore(concealer): delete unnecessary line break +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* unnecesary check removed +* fix(concealer): fix capture +* refactor(concealer): add const to requestAutoModeForCooperation +* refactor(concealer): mark isPackageExists as noexcept +* chore(concealer): roll back the number of retries for setVelocityLimit +* chore: update comments +* Move some metafunctions into new header files +* Update `plan` to check that `SetRoutePoints::Requst` has the data member `option` +* removed leftover include +* Cleanup +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* fix(concealer): ignore timeout with engage service +* fix(concealer): set long validation interval for /api/routing/set_route_points +* feat(concealer): support modifying validation interval of ServiceWithValidation +* fix(concealer): allow timeout for requestInitialPose +* feat(concealer): add timeout exception class for ServiceWithValidation +* feat(concealer): enable timeout validation switching for ServiceWithValidation +* feat(concealer): add support for autoware_adapi_v1_msgs::msg::ResponseStatus for service response validation in ServiceWithValidation +* fix(concealer): revive ServiceWithValidation::validateAvailability and fix logic +* added has_include condition for localization state related code +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore(concealer): modify maximum number of retry for set velocity limit service +* refactor: service_with_validation.hpp +* refactor(concealer): organize order of class member variable +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(concealer): organize order of class member variable +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore: apply linter +* refactor(concealer): add is_package_exists.hpp +* refactor(concealer): stop using utility directory +* fix(concealer): fix the history filter of cooperate statuses +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* fix(concealer): fix build errors +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1060 `_ from tier4/AJD-805/baseline_update_rebased + feat: Update topics and services to be compatible with the latest AD API +* fix(concealer): fix failure handling for service response +* clang format +* sending initial pose only when localizaiton is uninitialized +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* fix(concealer): add history filter for rtc command +* chore: apply linter +* feat(concealer): use task_queue to send RTC service request +* feat(concealer): import latest ServiceWithValidation class from RobotecAI's work +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Apply review changes +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: delete cooperator +* fix(concealer): fix compile errors +* feat(concealer): update interface for rtc auto mode +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* feat(concealer): add empty implementation of requestAutoModeForCooperation +* refactor(concealer): delete concealer::cooperate, approve +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix clang format error +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* sending initial pose rate limited +* checkpoints reintroduced +* brought back velocity limit and cooperate commands +* commented clock and parts of concealer +* Run clang format +* Delete comments and new lines +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Regression: revert change operation mode to engage due to engage request after stopping +* Regression: fix autoware state naming +* Regression: stop overriding mrm state and behavior +* Update /autoware/state to /api/iv_msgs/autoware/state OLD AD API +* Implement /api/routing/set_route_points AD API +* Update getTrajectory topic type +* Revert "WIP: get and sets for vehicle status" + This reverts commit bf9d0d2f86fcf729f015ba9312fdc830279a4124. +* WIP: get and sets for vehicle status +* Implement /api/external/get/emergency topic from tier4 external api +* Revert "WIP: add ADAPI support in service with validation" + This reverts commit 944a04fa30e786e79a8517dce88d0bb8b81f207e. +* Implement /api/localization/initialize service for position initialization +* Implement /api/operation_mode/change_to_autonomous to engage +* WIP: add ADAPI support in service with validation +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Cleanup +* Update `concealer` to use service SetRoutePoints +* Add the property `allowGoalModification` to switch destination topics +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + * Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence # Conflicts: # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 83a033daefd..ae50241f279 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.0 + 0.8.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/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 8e9966d6d85..b4a39c931ff 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -2,8 +2,29 @@ Changelog for package kashiwanoha_map ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + * Merge branch 'master' into feature/freespace-distance-condition * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection * Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 76c26ee2cb6..3919d21e340 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.0 + 0.8.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 6c39234ddf1..cf800bae227 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -2,8 +2,108 @@ Changelog for package cpp_mock_scenarios ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#1145 `_ from tier4/feature/random_scenario + Feature/random scenario +* modify default sensor model +* change default vehicle model +* remove unused lambda function +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* fix typo +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* remove debug line +* remove function object +* add spawn_nearby_ego entity +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* fix compile error +* add namespace +* update namespace +* add concealer +* add spawn outside vehicle +* overwrite label from parameter +* enable set label +* rename scenario class +* add namespace +* rename scenario classes +* add namespace +* add cpp_mock_scenarios +* remove debug lines +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* remove sending route function +* remove sending route +* enable run scenario +* update scenario +* Merge branch 'master' into AJD-805/baseline_update_rebased +* add comment +* uncomment targets +* fix scenario +* randomize speed +* despawn stopped pedestrian +* add offset variance parameter +* add s variance +* enable clean up entity +* set bounds +* enable update parameter +* add parameters +* modify condition +* update scenario +* update scenario +* update scenario +* add random scenario +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1080 `_ from tier4/doc/add_comment_for_pr_1074 + add comment about PR `#1074 `_ +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* add comment about PR `#1074 `_ +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + * Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence # Conflicts: # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index 58e04a4b21a..4f845925c40 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.0 + 0.8.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 77db40f497f..bde136b9d2e 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -2,8 +2,36 @@ Changelog for package openscenario_experimental_catalog ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* sample awsim scenario added, model3d added to sample vehicle catalogue +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution * Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index e81c539d1ad..2f983b4e4a8 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.0 + 0.8.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 6e06124e40d..75e09c783ff 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -2,8 +2,166 @@ Changelog for package openscenario_interpreter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1126 `_ from tier4/fix/duplicated_nodes + fix(launch): remove name keyword from nodes in launch file +* update CHANGELOG +* feat(user_defined_value): remove unused functional header +* feat(user_defined_value): add magic subscription counter +* feat(user_defined_value): add hash value based on name, rule, value to the subscription node name +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1121 `_ from tier4/fix/sign-of-relative-distance + Fix/sign of relative distance +* Add comments about the historical background of `RelativeDistanceCondition`'s behavior +* Fix some `RelativeDistanceCondition` mode to return non-negative value +* chore: apply linter +* refactor: renamed 'setTrafficLightConfidence' to 'setConventionalTrafficLightConfidence' +* feat(openscenario_interpreter): add PseudoTrafficSignalDetectorConfidenceSetAction@v1 +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#997 `_ from tier4/feature/allow-goal-modification + Feature/allow goal modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* feat: add error message for featureIdentifiersRequiringExternalPermissionForAutonomousDecisions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* change default port to 5555 +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(simulator_core): use featureIdentifiersRequiringExternalPermissionForAutonomousDecisions instead of manualModules +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1075 `_ from tier4/feature/RJD-96_detail_message_scenario_failure + feat(openscenario_interpreter): Detail the message in case of scenario failure +* change default port to 8080 +* ref(openscenario_interpreter): apply clang format +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): ref SpecialAction +* change port +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* code refactor +* Merge branch 'master' into feature/freespace-distance-condition +* Implement getBoundingBox* functions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* feat(openscenario_interpreter): parse manualModules +* refactor: delete cooperator +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge pull request `#1083 `_ from tier4/fix/distance-condition + fix/distance-condition +* Replace `LaneletId` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* ref(openscenario_interpreter): detailed result msg - last improve +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* ref(openscenario_interpreter): revert missing comment +* ref(openscenario_interpreter): revert comments format +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - third step +* Initial version of freespace distance condition +* remove workbound for galactic +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - second step +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - first step +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* fix: cast result to double in order to correctly compare equals values +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* ref(scenario_failure): remove blank lines +* ref(scenario_failure): remove blank lines +* ref(openscenario_interpreter): improve ScenarioFailure +* feat(openscenario_interpreter): inherit ScenarioFailure and tidy up +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): improve detailed failure message +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): improve ScenarioFailure +* feat(openscenario_interpreter): mv ScenarioError, add catch InitActions +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat(openscenario_interpreter): attach traffic light detector emulator in applyAssignControllerAction +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(openscenario_interpreter): improve exception for detail result msg +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* feat(openscenario_interpreter): first step detail result msg +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Add the property `allowGoalModification` to switch destination topics +* Remove debug prints that were left unintentionally +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + * Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` * Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index d70a747ae5a..1e946d8c186 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.0 + 0.8.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 09fb2d8d0ae..c7b7e8daeed 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -2,8 +2,29 @@ Changelog for package openscenario_interpreter_example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + * Merge branch 'master' into feature/freespace-distance-condition * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection * Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 7c9f3c6d4b9..3618819ccdd 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.0 + 0.8.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 0da2a3569e6..aad903ec82a 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -2,8 +2,29 @@ Changelog for package openscenario_interpreter_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + * Merge branch 'master' into feature/freespace-distance-condition * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection * Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 7a5c6d50736..2eed4edc041 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.0 + 0.8.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 66d72b99902..a018203dcaa 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -2,8 +2,39 @@ Changelog for package openscenario_preprocessor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1126 `_ from tier4/fix/duplicated_nodes + fix(launch): remove name keyword from nodes in launch file +* update CHANGELOG +* fix(launch): remove name keyword from openscenario_interpreter, openscenario_prepreocessor and simples_sensor_simulator nodes +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + * Merge branch 'master' into feature/freespace-distance-condition * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection * Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index f71c0c97d69..d26a63cad84 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.0 + 0.8.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 91190cf375b..65cf6bd4cdd 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -2,8 +2,33 @@ Changelog for package openscenario_preprocessor_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + * Merge branch 'master' into feature/freespace-distance-condition * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection * Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 6d0f31370b5..1be3138efb6 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.0 + 0.8.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 08700a0cc55..44f944154d8 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -2,8 +2,29 @@ Changelog for package openscenario_utility ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + * Merge branch 'master' into feature/freespace-distance-condition * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection * Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 4725d7fedb2..4dfac3b00ff 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.0 + 0.8.1 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index 7ca9d797ffd..d984ece2396 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -2,8 +2,29 @@ Changelog for package openscenario_visualization ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + * Merge branch 'master' into feature/freespace-distance-condition * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection * Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index 268ff698463..38980996cd9 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.0 + 0.8.1 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 63082cc87ab..a6763d65230 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,8 +2,45 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* fix CHANGELOG +* fix changelog +* Merge remote-tracking branch 'test/master' into feature/simplify_action +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#17 `_ from merge-queue-testing/fix/release + add conculency and modify commit message +* fix version +* Merge remote-tracking branch 'test/master' into fix/release +* Bump version of scenario_simulator_v2 to version 0.8.1 +* fix version +* [Bot] Bump version of scenario_simulator_v2 to version 0.8.1 +* Merge pull request `#10 `_ from merge-queue-testing/feature/bump_version_action + add trigger +* fix changelog +* update CHANGELOG +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* bump version of scenario_simulator_v2. +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + * Merge pull request `#17 `_ from merge-queue-testing/fix/release add conculency and modify commit message * fix version diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c49ab6f3033..c456a27a948 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.0 + 0.8.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 c0f99644525..0e754c897ad 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -2,8 +2,98 @@ Changelog for package behavior_tree_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* Merge remote-tracking branch 'origin/master' into feature/deleted-entity +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#1104 `_ from tier4/fix/entities-right-of-way + Fix/entities right of way +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* fix(action_node): calculate the backward distance in getYieldStopDistance +* fix(action_node): check if is not the same right of way for two diffrent lanelets +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1019 `_ from tier4/feature/fallback_spline_to_line_segments + Feature/fallback spline to line segments +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(behavior_tree): add FollowPolyline action to pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Update `makeUpdatedStatus` to take a reference to `PolylineTrajectory` instead of a pointer +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + * Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` * Merge remote-tracking branch 'origin/master' into feature/deleted-entity diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 8ef75d001f4..241e829724d 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.0 + 0.8.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 de43e0f62da..5a928fdcead 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -2,8 +2,70 @@ Changelog for package do_nothing_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + * Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` * chore: suppress warning from boost library diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 821518d758c..43a60595c0e 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.0 + 0.8.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 4fd26030bb6..8041509d67a 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -2,8 +2,141 @@ Changelog for package simple_sensor_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge pull request `#1144 `_ from tier4/feature/update_sim_model + Feature/update sim model +* doc: change comment style with note commands +* doc: fix note command place +* chore(simple_sensor_simulator): fix indent +* chore(simple_sensor_simulator): use @note command +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* chore(simple_sensor_simulator): delete acceleration_map.csv +* feat(simple_sensor_simulator): import sim_model_delay_steer_map_acc_geared +* feat(simple_sensor_simulator): import steer dead band feature + https://github.com/autowarefoundation/autoware.universe/pull/5477 +* update CHANGELOG +* refactor: reflect the reviews +* refactor(simple_sensor_simulator): delete name of unused argument to suppress warnings +* change default port to 5555 +* change default port to 8080 +* change port +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* refactor(traffic_simulator): change to a comparison method that is resistant to version changes +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor(simple_sensor_simulator): add explicit keyword to constructor + Co-authored-by: Tatsuya Yamasaki +* refactor(simple_sensor_simulator): TrafficLightDetectorEmulator => PseudoTrafficLightDetector + Co-authored-by: Tatsuya Yamasaki +* refactor(simple_sensor_simulator): TrafficLightDetectorEmulator => PseudoTrafficLightDetector + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* chore: change architecture_type to awf/universe/20230906 +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Update `update` to use `updateStatus` instead of `setStatus` +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update the Ego entity's FollowTrajectoryAction to take into account the vehicle model type +* Update yaw calculation during `FollowTrajectoryAction` for Ego entities +* Rename argument `time` to `current_scenario_time` +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* Merge remote-tracking branch 'origin/ref/RJD-553_restore_repeated_update_entity_status' into pzyskowski/660/ss2-awsim-connection +* Update `EgoEntitySimulation::update` to follow trajectory if is given +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: apply formatter +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update `followPolylineTrajectory` to store the given trajectory to ego +* Simplify member function `ScenarioSimulator::isEgo` +* Simplify member function `ScenarioSimulator::isEntityExists` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* fix(simple_sensor_simulator): update topic name for conventional traffic light +* refactor(simple_sensor_simulator): delete debug code +* refactor(simple_sensor_simulator): move include +* feat: add new architecture_type awf/universe/2023.08 +* refactor: delete unused lines/files +* refactor(simple_sensor_simulator): delete TrafficLightsDetectorBase +* chore: apply formatter +* feat(simple_sensor_simulator): implement ScenarioSimulator::attachTrafficLightDetectorEmulator +* refactor(simple_sensor_simulator): use TrafficLightPublisher in simple_sensor_simulator +* refactor(simple_sensor_simulator): use UpdateTrafficLightsRequest as a type for storing +* feat(simple_sensor_simulator): add base class for TrafficLightsDetector +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Revert "WIP: get and sets for vehicle status" + This reverts commit bf9d0d2f86fcf729f015ba9312fdc830279a4124. +* WIP: get and sets for vehicle status +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + * refactor: reflect the reviews * refactor(simple_sensor_simulator): delete name of unused argument to suppress warnings * change default port to 5555 diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index f1bdba391a2..085aafcd837 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.0 + 0.8.1 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 8e5c13221a8..755777b853c 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -2,8 +2,94 @@ Changelog for package simulation_interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor(simulation_interface) + Co-authored-by: Tatsuya Yamasaki +* refactor(simulation_interface) + Co-authored-by: Tatsuya Yamasaki +* Update simulation/simulation_interface/include/simulation_interface/conversions.hpp + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* chore: apply formatter +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: apply formatter +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* refactor: delete unused code / dependencies +* refactor(simulation_interface): delete unused conversion +* refactor(traffic_simulator): refactor data flow with simulation_api_schema::TrafficSignal +* refactor(simulation_interface/zmq_client): remove duplicated traffic light detector emulator call +* feat(simulator_interface): add support for autoware_msgs +* feat(simulator_interface): add AttachTrafficLightDetectorEmulatorRequest to ZMQ client/server +* chore(traffic_simulator): reformat +* feat(simlation_interface): add call function for AttachTrafficLightDetectorEmulatorRequest +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(simulation_interface): attachTrafficLightDetectorEmulatorRequest/Response +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit + * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Merge branch 'master' into feature/freespace-distance-condition * Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 03653d9dbea..1124bc1e55f 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.0 + 0.8.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 9eb9f8eec18..855ee95e4b8 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -2,8 +2,267 @@ Changelog for package traffic_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#1145 `_ from tier4/feature/random_scenario + Feature/random scenario +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1137 `_ from tier4/fix/RJD-727_fix_orientation_for_inactivity + fix(follow_trajectory): fix orientation for zero velocity vector (inactivity) +* fix(follow_trajectory): fix orientation for norm(v)==0 +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* fix: modify comment in traffic_light.hpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* fix: build errors +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* Merge remote-tracking branch 'origin/master' into fix/sign-of-relative-distance +* Merge pull request `#1096 `_ from tier4/feature/deleted-entity + Support for de-spawning entity +* Update simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/data_type/speed_change.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/data_type/speed_change.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/entity/entity_base.hpp + Co-authored-by: Tatsuya Yamasaki +* add clang-format off +* refactor: reflect the reviews +* update doxyfile +* add simulation package +* add comment +* add spawn outside vehicle +* refactor: renamed 'setTrafficLightConfidence' to 'setConventionalTrafficLightConfidence' +* update Doxyfile +* fix(traffic_simulator): update setTrafficLightConfidence function to handle multiple TrafficLights +* fix(traffic_simulator): fix build errors +* feat(openscenario_interpreter): add PseudoTrafficSignalDetectorConfidenceSetAction@v1 +* feat(traffic_simulator): add EntityManager::setTrafficLightConfidence +* feat(traffic_simulator): move confidence field from Bulb class to TrafficLight class +* feat: invalidate status in deleted entity +* feat: remove DELETED entity type by using internal id +* feat: add deleted entity to traffic simulator +* feat(traffic_simulator): add confidence to Bulb class +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore: apply clang_format +* feat(traffic_simualtor): set use_foa=true to use default auto_mode settings +* Merge pull request `#1101 `_ from tier4/fix/standstill_duration + add updateStandStillDuration(step_time) and updateTraveledDistance(st… +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* add updateStandStillDuration(step_time) and updateTraveledDistance(step_time) when the entity failed to match lanelet +* remove debug lines +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* enable clean up entity +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Implement getBoundingBox* functions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* fix spelling +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(behavior_tree): add FollowPolyline action to pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* remove debug line +* fix case +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Rename `gelAllCanonicalizedLaneletPoses` to `get...` +* Cleanup +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Replace `LaneletId` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* chore: apply formatter +* refactor(HdMapUtils): rename functions related to traffic light +* refactor(traffic_simulator): change to a comparison method that is resistant to version changes +* refactor(traffic_simulator): delete unnecessary optimization +* fix(traffic_simulator): fix build errors +* chore(traffic_simulator): add LaneletId alias +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor: use better word "thunk" instead of callback + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator): use LaneletId instead of std::int64_t + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator) + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator) + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* apply reformat +* Initial version of freespace distance condition +* remove workbound for galactic +* chore: apply formatter +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* chore: change architecture_type to awf/universe/20230906 +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* apply reformat +* refactor: apply formatter with clang-format v14 +* reintroduced clock publshing +* add getSValue function +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* add white space +* apply reformat +* commented clock and parts of concealer +* refactor: apply formatter +* refactor: delete debug messages +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* chore: apply formatter +* fix(TrafficLight): delete relation_id in TrafficLight class and use latest getTrafficLightRelationIDFromWayID +* fix(HDMapUtils): return all relation ids from getTrafficLightRelationIDFromWayID +* apply reformat +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update `makeUpdatedStatus` to take a reference to `PolylineTrajectory` instead of a pointer +* apply reformat +* fix(traffic_simulator/ego): switch a parameter for new architecture_type +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* refactor: delete unused code / dependencies +* feat: add new architecture_type awf/universe/2023.08 +* chore: apply formatter +* refactor: delete unused lines/files +* feat(traffic_simulator): implement conversion from way_id to relation_id +* refactor(traffic_simulator): fix initialization order of member variables in ConfigurableRateUpdater +* chore: apply formatter +* fix(traffic_simulator): fix compile errors +* refactor(traffic_simulator): refactor data flow with simulation_api_schema::TrafficSignal +* refactor(traffic_simulator): refactor ConfigurableRateUpdater +* refactor(traffic_simulator): delete V2ITrafficLightPublisher and use TrafficLightPublisher +* feat(traffic_simulator): use new ConfigurableRateUpdater in TrafficLightMarkerPublisher +* feat(traffic_simulator): implement proto exporting from TrafficLightManager +* feat(traffic_simulator): Add TrafficLightPublisher +* refactor(traffic_simulator): refactor ConfigurableRateUpdater +* refactor(traffic_simulator): delete unused files +* feat(simple_sensor_simulator): add base class for TrafficLightsDetector +* fix(traffic_simulator): fix build errors +* chore(traffic_simulator): reformat +* fix(traffic_simulator): use new message in V2ITrafficLightPublisher +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* fix(traffic_simulator): fix V2ITrafficLightPublisher +* feat(simulation_interface): attachTrafficLightDetectorEmulatorRequest/Response +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* chore(traffic_light): apply ament_clang_format +* refactor(traffic_light): use new architecture_type +* chore(traffic_light): delay creating publisher +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt +* chore(traffic_light): override pure virtual function +* chore(traffic_light): delete empty files +* chore(traffic_light): adapt to variations of traffic light bulb types +* fix(entity_manager): fix errors for traffic light tests +* feat(entity_manager): use new traffic light managers in entity_manager +* feat(traffic_light): add codes for new message +* chore(traffic_light): prepare for runtime topic adaptation +* chore(traffic_light): delete TrafficLightManager type specialization +* chore(traffic_light): rename timers +* chore(traffic_light): set relation_id for new message type +* chore(traffic_light): add template for TrafficLight::Bulb conversion operator +* chore(traffic_light): fix errors +* fix(HDMapUtils): getTrafficLightRelationIDFromWayID +* chore: reformat +* feat(HDMapUtils): getTrafficLightRelationIDFromWayID +* chore(traffic_light): add perception messages for traffic light +* refactor(traffic_light): use TrafficLightBase +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* refactor(traffic_light): use updated function name +* feat(traffic_light): add TrafficLightBase and parameterize msg type of TrafficLight +* refactor(HDMapUtil): rename some functions +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, f0reachARR, yamacir-kit + * Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` * fix: modify comment in traffic_light.hpp diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index a8378211064..d14743936db 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.0 + 0.8.1 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index f62b33eb088..c42c0824f44 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -2,8 +2,35 @@ Changelog for package openscenario_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* feat: remove DELETED entity type by using internal id +* feat: add deleted entity to traffic simulator +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, f0reachARR, yamacir-kit + * feat: remove DELETED entity type by using internal id * feat: add deleted entity to traffic simulator * Merge branch 'master' into feature/freespace-distance-condition diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index b7f066cb922..2c13d4f660d 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.0 + 0.8.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 4a89673b455..ec23f50ec0b 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -2,8 +2,78 @@ Changelog for package random_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1128 `_ from RobotecAI/fix/random-test-runner-fix + Random test runner fix +* rvalue reference used in executeWithErrorHandling +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Exceptions handling in TestExecutor +* Separate traffic_simulator::API for each TestExecutor +* OccupancyGridSensor attachment and allow_goal_modification parameter declaration +* initialize_duration added to launch file +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* change default port to 5555 +* change default port to 8080 +* change port +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* chore: change architecture_type to awf/universe/20230906 +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat: add new architecture_type awf/universe/2023.08 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit + * Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` * chore: suppress warning from boost library diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 48a3ef208ce..594e78e5ec6 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.0 + 0.8.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 73bd587c897..92d7ccbda72 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -2,8 +2,148 @@ Changelog for package scenario_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Forthcoming ------------ +0.8.1 (2024-01-24) +------------------ +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1126 `_ from tier4/fix/duplicated_nodes + fix(launch): remove name keyword from nodes in launch file +* update CHANGELOG +* fix(launch): add comment about the change from LifecycleNode to Node +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* fix(launch): remove name keyword from openscenario_interpreter, openscenario_prepreocessor and simples_sensor_simulator nodes +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1121 `_ from tier4/fix/sign-of-relative-distance + Fix/sign of relative distance +* Merge remote-tracking branch 'origin/master' into fix/sign-of-relative-distance +* Merge pull request `#1096 `_ from tier4/feature/deleted-entity + Support for de-spawning entity +* Update test scenario to not expect negative distance for `RelativeDistanceCondition` in non-lane coordinate systems +* feat: update CustomCommandAction.PseudoTrafficSignalDetectorConfidenceSetAction@v1.yaml +* chore: update author of sample scenario +* chore: add example scenario of DeleteEntityAction +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* fix: destination of CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* feat: add continuous rtc action execution in CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* refactor: delete cooperator property from CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* change default port to 5555 +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(simulator_core): use featureIdentifiersRequiringExternalPermissionForAutonomousDecisions instead of manualModules +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1075 `_ from tier4/feature/RJD-96_detail_message_scenario_failure + feat(openscenario_interpreter): Detail the message in case of scenario failure +* change default port to 8080 +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* change port +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* feat: update scenario for new RTC feature +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(test_runner): add FollowTrajectoryAction for bicycle and pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix(test_runner): fix scenarios directory +* feat(scenario_test_runner): add workflow for simulation failure - detailed message +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Initial version of freespace distance condition +* chore: change architecture_type to awf/universe/20230906 +* misc object updated in sample awsim +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* updated npc in awsim_sample scenario +* Update `update` to use `updateStatus` instead of `setStatus` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* added MiscObject to awsim_sample scenario +* fixed map path +* added modifier to awsim sample scenario +* sample awsim scenario added, model3d added to sample vehicle catalogue +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Add new test scenario `RoutingAction.FollowTrajectoryAction-autoware` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat: add new architecture_type awf/universe/2023.08 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, f0reachARR, yamacir-kit + * Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` * Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 63c314583fe..d004ae3ec3a 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.0 + 0.8.1 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From dcea219824a8f636e0823d53202f73aec73f234c Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 12:33:46 +0900 Subject: [PATCH 145/245] restore branch Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 344a9d19259..bd4b4f4b7cc 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -32,9 +32,11 @@ jobs: timeout-minutes: 10 container: ros:humble steps: - - name: install bloom + - name: Restore branch + uses: levonet/action-restore-branch@master + - name: Install bloom run: apt update && apt install -y python3-bloom git - - name: checkout + - name: Checkout uses: actions/checkout@v2 with: ref: master From c9f197dabb45ab4c2ce52e5828521ea13a894e9b Mon Sep 17 00:00:00 2001 From: Release Bot Date: Wed, 24 Jan 2024 03:43:25 +0000 Subject: [PATCH 146/245] Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 --- common/math/arithmetic/CHANGELOG.rst | 26 ++ common/math/arithmetic/package.xml | 2 +- common/math/geometry/CHANGELOG.rst | 153 ++++++++++ common/math/geometry/package.xml | 2 +- .../CHANGELOG.rst | 40 +++ .../scenario_simulator_exception/package.xml | 2 +- common/simple_junit/CHANGELOG.rst | 36 +++ common/simple_junit/package.xml | 2 +- common/status_monitor/CHANGELOG.rst | 25 ++ common/status_monitor/package.xml | 2 +- external/concealer/CHANGELOG.rst | 151 ++++++++++ external/concealer/package.xml | 2 +- map/kashiwanoha_map/CHANGELOG.rst | 25 ++ map/kashiwanoha_map/package.xml | 2 +- mock/cpp_mock_scenarios/CHANGELOG.rst | 104 +++++++ mock/cpp_mock_scenarios/package.xml | 2 +- .../CHANGELOG.rst | 32 +++ .../package.xml | 2 +- .../openscenario_interpreter/CHANGELOG.rst | 162 +++++++++++ .../openscenario_interpreter/package.xml | 2 +- .../CHANGELOG.rst | 25 ++ .../package.xml | 2 +- .../CHANGELOG.rst | 25 ++ .../openscenario_interpreter_msgs/package.xml | 2 +- .../openscenario_preprocessor/CHANGELOG.rst | 35 +++ .../openscenario_preprocessor/package.xml | 2 +- .../CHANGELOG.rst | 29 ++ .../package.xml | 2 +- .../openscenario_utility/CHANGELOG.rst | 25 ++ openscenario/openscenario_utility/package.xml | 2 +- .../openscenario_visualization/CHANGELOG.rst | 25 ++ .../openscenario_visualization/package.xml | 2 +- scenario_simulator_v2/CHANGELOG.rst | 41 +++ scenario_simulator_v2/package.xml | 2 +- simulation/behavior_tree_plugin/CHANGELOG.rst | 94 +++++++ simulation/behavior_tree_plugin/package.xml | 2 +- simulation/do_nothing_plugin/CHANGELOG.rst | 66 +++++ simulation/do_nothing_plugin/package.xml | 2 +- .../simple_sensor_simulator/CHANGELOG.rst | 137 +++++++++ .../simple_sensor_simulator/package.xml | 2 +- simulation/simulation_interface/CHANGELOG.rst | 90 ++++++ simulation/simulation_interface/package.xml | 2 +- simulation/traffic_simulator/CHANGELOG.rst | 263 ++++++++++++++++++ simulation/traffic_simulator/package.xml | 2 +- .../traffic_simulator_msgs/CHANGELOG.rst | 31 +++ simulation/traffic_simulator_msgs/package.xml | 2 +- test_runner/random_test_runner/CHANGELOG.rst | 74 +++++ test_runner/random_test_runner/package.xml | 2 +- .../scenario_test_runner/CHANGELOG.rst | 144 ++++++++++ test_runner/scenario_test_runner/package.xml | 2 +- 50 files changed, 1883 insertions(+), 25 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index b82939f76f7..6d76841d685 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -43,6 +43,32 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index 1ff0903809a..0fffca617c6 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.1 + 0.8.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 9811aedaca8..b48058a5758 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -295,6 +295,159 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Shota Minami, Tatsuya Yamasaki, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge pull request `#1102 `_ from tier4/fix/wrong_distance + Change possibly wrong subtraction of distance calculation to assignment +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Change subtraction to assignment +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1019 `_ from tier4/feature/fallback_spline_to_line_segments + Feature/fallback spline to line segments +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* fix case +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix format +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* fix typo +* add torelance +* fix getSValue function in line segment class +* add getSValue function +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* use auto +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* add member initializer +* add test case +* fix problem in total_length in CatmullRomSpline class +* use push_back +* add comment +* update comment +* add comment +* fix comment +* fix typo +* add white line +* add white line +* fix typo +* fix typo +* remove plot +* add comment +* udpate comment +* add comment +* add comment +* apply reformat +* update comment +* add gnupolot files +* update comment +* fix comment +* update if +* add comment +* add comment +* add auto scale +* add test case +* fix denormalize +* add comment +* add comment +* add comment +* use auto and -> +* use & +* use auto -> +* remove unused header +* use auto and -> +* add const +* update comment +* add description +* care edge case +* simplify code +* update comment +* update comment +* update comment +* fix typo +* add error message +* add comment +* add test case +* add comment +* add comment +* add comment +* add test case +* update test case +* remove unused function +* add autoscale to the line segment +* update description +* add description +* fix autoscale feature +* add comment +* fix typo +* enable fallback for each functions +* fix some of member function +* add white line for visibility +* add message +* add comment +* remove unused line +* add comment +* add comments +* add comment +* add comment +* add comment +* add test case +* add test case +* add docs +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* add test case +* add test case +* add test case +* fix calculate s value +* fix getLineSegments function +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* enable check collision to the point +* add functions +* simplify code +* add const +* use lambda +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index 4b807f3d0f8..b01a38ce127 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.1 + 0.8.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 7cb42fe14c4..acc26c287ce 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -69,6 +69,46 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* add define error category +* add SpecificationViolation +* update Doxyfile +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* ref(openscenario_interpreter): revert comments format +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(openscenario_interpreter): inherit ScenarioFailure and tidy up +* feat(openscenario_interpreter): mv ScenarioError, add catch InitActions +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(openscenario_interpreter): improve exception for detail result msg +* feat(openscenario_interpreter): first step detail result msg +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 3a4969a254e..b78c16e69a9 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.1 + 0.8.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 88e07d6aa2f..59ec2f170b5 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -61,6 +61,42 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* fix typo +* update Doxyfile +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index dccf4679e8b..5240db5d2ed 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.1 + 0.8.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 1bf7ec75d35..925895c4c2d 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -41,6 +41,31 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 177494b81f2..4d9f21ec3c3 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.1 + 0.8.2 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index 94506804d44..332662af949 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -291,6 +291,157 @@ Changelog for package concealer * Add the property `allowGoalModification` to switch destination topics * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* update Doxyfile +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#1106 `_ from tier4/fix/rtc_command_action/continuous_execution + Fix/rtc command action/continuous execution +* Merge pull request `#997 `_ from tier4/feature/allow-goal-modification + Feature/allow goal modification +* doc(concealer): add notes for RTC used status filter +* refactor: service_with_validation.hpp +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* refactor(concealer): delete debug print +* chore(concealer): delete unnecessary line break +* chore(concealer): delete unnecessary line break +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* unnecesary check removed +* fix(concealer): fix capture +* refactor(concealer): add const to requestAutoModeForCooperation +* refactor(concealer): mark isPackageExists as noexcept +* chore(concealer): roll back the number of retries for setVelocityLimit +* chore: update comments +* Move some metafunctions into new header files +* Update `plan` to check that `SetRoutePoints::Requst` has the data member `option` +* removed leftover include +* Cleanup +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* fix(concealer): ignore timeout with engage service +* fix(concealer): set long validation interval for /api/routing/set_route_points +* feat(concealer): support modifying validation interval of ServiceWithValidation +* fix(concealer): allow timeout for requestInitialPose +* feat(concealer): add timeout exception class for ServiceWithValidation +* feat(concealer): enable timeout validation switching for ServiceWithValidation +* feat(concealer): add support for autoware_adapi_v1_msgs::msg::ResponseStatus for service response validation in ServiceWithValidation +* fix(concealer): revive ServiceWithValidation::validateAvailability and fix logic +* added has_include condition for localization state related code +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore(concealer): modify maximum number of retry for set velocity limit service +* refactor: service_with_validation.hpp +* refactor(concealer): organize order of class member variable +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(concealer): organize order of class member variable +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore: apply linter +* refactor(concealer): add is_package_exists.hpp +* refactor(concealer): stop using utility directory +* fix(concealer): fix the history filter of cooperate statuses +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* fix(concealer): fix build errors +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1060 `_ from tier4/AJD-805/baseline_update_rebased + feat: Update topics and services to be compatible with the latest AD API +* fix(concealer): fix failure handling for service response +* clang format +* sending initial pose only when localizaiton is uninitialized +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* fix(concealer): add history filter for rtc command +* chore: apply linter +* feat(concealer): use task_queue to send RTC service request +* feat(concealer): import latest ServiceWithValidation class from RobotecAI's work +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Apply review changes +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: delete cooperator +* fix(concealer): fix compile errors +* feat(concealer): update interface for rtc auto mode +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* feat(concealer): add empty implementation of requestAutoModeForCooperation +* refactor(concealer): delete concealer::cooperate, approve +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix clang format error +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* sending initial pose rate limited +* checkpoints reintroduced +* brought back velocity limit and cooperate commands +* commented clock and parts of concealer +* Run clang format +* Delete comments and new lines +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Regression: revert change operation mode to engage due to engage request after stopping +* Regression: fix autoware state naming +* Regression: stop overriding mrm state and behavior +* Update /autoware/state to /api/iv_msgs/autoware/state OLD AD API +* Implement /api/routing/set_route_points AD API +* Update getTrajectory topic type +* Revert "WIP: get and sets for vehicle status" + This reverts commit bf9d0d2f86fcf729f015ba9312fdc830279a4124. +* WIP: get and sets for vehicle status +* Implement /api/external/get/emergency topic from tier4 external api +* Revert "WIP: add ADAPI support in service with validation" + This reverts commit 944a04fa30e786e79a8517dce88d0bb8b81f207e. +* Implement /api/localization/initialize service for position initialization +* Implement /api/operation_mode/change_to_autonomous to engage +* WIP: add ADAPI support in service with validation +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Cleanup +* Update `concealer` to use service SetRoutePoints +* Add the property `allowGoalModification` to switch destination topics +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/external/concealer/package.xml b/external/concealer/package.xml index ae50241f279..a3595185adf 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.1 + 0.8.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/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index b4a39c931ff..14e990e0648 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -41,6 +41,31 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 3919d21e340..ca44e77bc69 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.1 + 0.8.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 cf800bae227..df492857c17 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -163,6 +163,110 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#1145 `_ from tier4/feature/random_scenario + Feature/random scenario +* modify default sensor model +* change default vehicle model +* remove unused lambda function +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* fix typo +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* remove debug line +* remove function object +* add spawn_nearby_ego entity +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* fix compile error +* add namespace +* update namespace +* add concealer +* add spawn outside vehicle +* overwrite label from parameter +* enable set label +* rename scenario class +* add namespace +* rename scenario classes +* add namespace +* add cpp_mock_scenarios +* remove debug lines +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* remove sending route function +* remove sending route +* enable run scenario +* update scenario +* Merge branch 'master' into AJD-805/baseline_update_rebased +* add comment +* uncomment targets +* fix scenario +* randomize speed +* despawn stopped pedestrian +* add offset variance parameter +* add s variance +* enable clean up entity +* set bounds +* enable update parameter +* add parameters +* modify condition +* update scenario +* update scenario +* update scenario +* add random scenario +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1080 `_ from tier4/doc/add_comment_for_pr_1074 + add comment about PR `#1074 `_ +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* add comment about PR `#1074 `_ +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index 4f845925c40..bb6e1cfcbbc 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.1 + 0.8.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 bde136b9d2e..317a0a6f787 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -53,6 +53,38 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* sample awsim scenario added, model3d added to sample vehicle catalogue +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 2f983b4e4a8..e75962fab5d 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.1 + 0.8.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 75e09c783ff..717366165f5 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -306,6 +306,168 @@ Changelog for package openscenario_interpreter * Remove debug prints that were left unintentionally * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1126 `_ from tier4/fix/duplicated_nodes + fix(launch): remove name keyword from nodes in launch file +* update CHANGELOG +* feat(user_defined_value): remove unused functional header +* feat(user_defined_value): add magic subscription counter +* feat(user_defined_value): add hash value based on name, rule, value to the subscription node name +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1121 `_ from tier4/fix/sign-of-relative-distance + Fix/sign of relative distance +* Add comments about the historical background of `RelativeDistanceCondition`'s behavior +* Fix some `RelativeDistanceCondition` mode to return non-negative value +* chore: apply linter +* refactor: renamed 'setTrafficLightConfidence' to 'setConventionalTrafficLightConfidence' +* feat(openscenario_interpreter): add PseudoTrafficSignalDetectorConfidenceSetAction@v1 +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#997 `_ from tier4/feature/allow-goal-modification + Feature/allow goal modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* feat: add error message for featureIdentifiersRequiringExternalPermissionForAutonomousDecisions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* change default port to 5555 +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(simulator_core): use featureIdentifiersRequiringExternalPermissionForAutonomousDecisions instead of manualModules +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1075 `_ from tier4/feature/RJD-96_detail_message_scenario_failure + feat(openscenario_interpreter): Detail the message in case of scenario failure +* change default port to 8080 +* ref(openscenario_interpreter): apply clang format +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): ref SpecialAction +* change port +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* code refactor +* Merge branch 'master' into feature/freespace-distance-condition +* Implement getBoundingBox* functions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* feat(openscenario_interpreter): parse manualModules +* refactor: delete cooperator +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge pull request `#1083 `_ from tier4/fix/distance-condition + fix/distance-condition +* Replace `LaneletId` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* ref(openscenario_interpreter): detailed result msg - last improve +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* ref(openscenario_interpreter): revert missing comment +* ref(openscenario_interpreter): revert comments format +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - third step +* Initial version of freespace distance condition +* remove workbound for galactic +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - second step +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - first step +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* fix: cast result to double in order to correctly compare equals values +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* ref(scenario_failure): remove blank lines +* ref(scenario_failure): remove blank lines +* ref(openscenario_interpreter): improve ScenarioFailure +* feat(openscenario_interpreter): inherit ScenarioFailure and tidy up +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): improve detailed failure message +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): improve ScenarioFailure +* feat(openscenario_interpreter): mv ScenarioError, add catch InitActions +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat(openscenario_interpreter): attach traffic light detector emulator in applyAssignControllerAction +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(openscenario_interpreter): improve exception for detail result msg +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* feat(openscenario_interpreter): first step detail result msg +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Add the property `allowGoalModification` to switch destination topics +* Remove debug prints that were left unintentionally +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 1e946d8c186..1ad54de8183 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.1 + 0.8.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 c7b7e8daeed..b495857cfa8 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -41,6 +41,31 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 3618819ccdd..2c2271eb320 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.1 + 0.8.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 aad903ec82a..b913e6ec883 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -41,6 +41,31 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 2eed4edc041..35a8c9518d8 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.1 + 0.8.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 a018203dcaa..385eb9baba8 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -55,6 +55,41 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1126 `_ from tier4/fix/duplicated_nodes + fix(launch): remove name keyword from nodes in launch file +* update CHANGELOG +* fix(launch): remove name keyword from openscenario_interpreter, openscenario_prepreocessor and simples_sensor_simulator nodes +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index d26a63cad84..faf186c560c 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.1 + 0.8.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 65cf6bd4cdd..2d6ecb20d4e 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -49,6 +49,35 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 1be3138efb6..252a67ee3b2 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.1 + 0.8.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 44f944154d8..be40ce64bd7 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -41,6 +41,31 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 4dfac3b00ff..a8968989fa1 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.1 + 0.8.2 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index d984ece2396..4367c63af82 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -41,6 +41,31 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index 38980996cd9..91dbf4808e4 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.1 + 0.8.2 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index a6763d65230..3edf188b6b2 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -163,6 +163,47 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* fix CHANGELOG +* fix changelog +* Merge remote-tracking branch 'test/master' into feature/simplify_action +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#17 `_ from merge-queue-testing/fix/release + add conculency and modify commit message +* fix version +* Merge remote-tracking branch 'test/master' into fix/release +* Bump version of scenario_simulator_v2 to version 0.8.1 +* fix version +* [Bot] Bump version of scenario_simulator_v2 to version 0.8.1 +* Merge pull request `#10 `_ from merge-queue-testing/feature/bump_version_action + add trigger +* fix changelog +* update CHANGELOG +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* bump version of scenario_simulator_v2. +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index c456a27a948..b0d9c539898 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.1 + 0.8.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 0e754c897ad..88e73c0c91e 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -176,6 +176,100 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* Merge remote-tracking branch 'origin/master' into feature/deleted-entity +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#1104 `_ from tier4/fix/entities-right-of-way + Fix/entities right of way +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* fix(action_node): calculate the backward distance in getYieldStopDistance +* fix(action_node): check if is not the same right of way for two diffrent lanelets +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1019 `_ from tier4/feature/fallback_spline_to_line_segments + Feature/fallback spline to line segments +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(behavior_tree): add FollowPolyline action to pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Update `makeUpdatedStatus` to take a reference to `PolylineTrajectory` instead of a pointer +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 241e829724d..10b152b19a2 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.1 + 0.8.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 5a928fdcead..04fa7708842 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -120,6 +120,72 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 43a60595c0e..38f3a011e97 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.1 + 0.8.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 8041509d67a..117d1086f68 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -253,6 +253,143 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge pull request `#1144 `_ from tier4/feature/update_sim_model + Feature/update sim model +* doc: change comment style with note commands +* doc: fix note command place +* chore(simple_sensor_simulator): fix indent +* chore(simple_sensor_simulator): use @note command +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* chore(simple_sensor_simulator): delete acceleration_map.csv +* feat(simple_sensor_simulator): import sim_model_delay_steer_map_acc_geared +* feat(simple_sensor_simulator): import steer dead band feature + https://github.com/autowarefoundation/autoware.universe/pull/5477 +* update CHANGELOG +* refactor: reflect the reviews +* refactor(simple_sensor_simulator): delete name of unused argument to suppress warnings +* change default port to 5555 +* change default port to 8080 +* change port +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* refactor(traffic_simulator): change to a comparison method that is resistant to version changes +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor(simple_sensor_simulator): add explicit keyword to constructor + Co-authored-by: Tatsuya Yamasaki +* refactor(simple_sensor_simulator): TrafficLightDetectorEmulator => PseudoTrafficLightDetector + Co-authored-by: Tatsuya Yamasaki +* refactor(simple_sensor_simulator): TrafficLightDetectorEmulator => PseudoTrafficLightDetector + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* chore: change architecture_type to awf/universe/20230906 +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Update `update` to use `updateStatus` instead of `setStatus` +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update the Ego entity's FollowTrajectoryAction to take into account the vehicle model type +* Update yaw calculation during `FollowTrajectoryAction` for Ego entities +* Rename argument `time` to `current_scenario_time` +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* Merge remote-tracking branch 'origin/ref/RJD-553_restore_repeated_update_entity_status' into pzyskowski/660/ss2-awsim-connection +* Update `EgoEntitySimulation::update` to follow trajectory if is given +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: apply formatter +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update `followPolylineTrajectory` to store the given trajectory to ego +* Simplify member function `ScenarioSimulator::isEgo` +* Simplify member function `ScenarioSimulator::isEntityExists` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* fix(simple_sensor_simulator): update topic name for conventional traffic light +* refactor(simple_sensor_simulator): delete debug code +* refactor(simple_sensor_simulator): move include +* feat: add new architecture_type awf/universe/2023.08 +* refactor: delete unused lines/files +* refactor(simple_sensor_simulator): delete TrafficLightsDetectorBase +* chore: apply formatter +* feat(simple_sensor_simulator): implement ScenarioSimulator::attachTrafficLightDetectorEmulator +* refactor(simple_sensor_simulator): use TrafficLightPublisher in simple_sensor_simulator +* refactor(simple_sensor_simulator): use UpdateTrafficLightsRequest as a type for storing +* feat(simple_sensor_simulator): add base class for TrafficLightsDetector +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Revert "WIP: get and sets for vehicle status" + This reverts commit bf9d0d2f86fcf729f015ba9312fdc830279a4124. +* WIP: get and sets for vehicle status +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 085aafcd837..69741486036 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.1 + 0.8.2 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 755777b853c..d5c2acd426f 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -171,6 +171,96 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor(simulation_interface) + Co-authored-by: Tatsuya Yamasaki +* refactor(simulation_interface) + Co-authored-by: Tatsuya Yamasaki +* Update simulation/simulation_interface/include/simulation_interface/conversions.hpp + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* chore: apply formatter +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: apply formatter +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* refactor: delete unused code / dependencies +* refactor(simulation_interface): delete unused conversion +* refactor(traffic_simulator): refactor data flow with simulation_api_schema::TrafficSignal +* refactor(simulation_interface/zmq_client): remove duplicated traffic light detector emulator call +* feat(simulator_interface): add support for autoware_msgs +* feat(simulator_interface): add AttachTrafficLightDetectorEmulatorRequest to ZMQ client/server +* chore(traffic_simulator): reformat +* feat(simlation_interface): add call function for AttachTrafficLightDetectorEmulatorRequest +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(simulation_interface): attachTrafficLightDetectorEmulatorRequest/Response +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 1124bc1e55f..fc466eb12df 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.1 + 0.8.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 855ee95e4b8..27e6e261e96 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -505,6 +505,269 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#1145 `_ from tier4/feature/random_scenario + Feature/random scenario +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1137 `_ from tier4/fix/RJD-727_fix_orientation_for_inactivity + fix(follow_trajectory): fix orientation for zero velocity vector (inactivity) +* fix(follow_trajectory): fix orientation for norm(v)==0 +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* fix: modify comment in traffic_light.hpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* fix: build errors +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* Merge remote-tracking branch 'origin/master' into fix/sign-of-relative-distance +* Merge pull request `#1096 `_ from tier4/feature/deleted-entity + Support for de-spawning entity +* Update simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/data_type/speed_change.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/data_type/speed_change.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/entity/entity_base.hpp + Co-authored-by: Tatsuya Yamasaki +* add clang-format off +* refactor: reflect the reviews +* update doxyfile +* add simulation package +* add comment +* add spawn outside vehicle +* refactor: renamed 'setTrafficLightConfidence' to 'setConventionalTrafficLightConfidence' +* update Doxyfile +* fix(traffic_simulator): update setTrafficLightConfidence function to handle multiple TrafficLights +* fix(traffic_simulator): fix build errors +* feat(openscenario_interpreter): add PseudoTrafficSignalDetectorConfidenceSetAction@v1 +* feat(traffic_simulator): add EntityManager::setTrafficLightConfidence +* feat(traffic_simulator): move confidence field from Bulb class to TrafficLight class +* feat: invalidate status in deleted entity +* feat: remove DELETED entity type by using internal id +* feat: add deleted entity to traffic simulator +* feat(traffic_simulator): add confidence to Bulb class +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore: apply clang_format +* feat(traffic_simualtor): set use_foa=true to use default auto_mode settings +* Merge pull request `#1101 `_ from tier4/fix/standstill_duration + add updateStandStillDuration(step_time) and updateTraveledDistance(st… +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* add updateStandStillDuration(step_time) and updateTraveledDistance(step_time) when the entity failed to match lanelet +* remove debug lines +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* enable clean up entity +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Implement getBoundingBox* functions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* fix spelling +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(behavior_tree): add FollowPolyline action to pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* remove debug line +* fix case +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Rename `gelAllCanonicalizedLaneletPoses` to `get...` +* Cleanup +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Replace `LaneletId` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* chore: apply formatter +* refactor(HdMapUtils): rename functions related to traffic light +* refactor(traffic_simulator): change to a comparison method that is resistant to version changes +* refactor(traffic_simulator): delete unnecessary optimization +* fix(traffic_simulator): fix build errors +* chore(traffic_simulator): add LaneletId alias +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor: use better word "thunk" instead of callback + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator): use LaneletId instead of std::int64_t + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator) + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator) + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* apply reformat +* Initial version of freespace distance condition +* remove workbound for galactic +* chore: apply formatter +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* chore: change architecture_type to awf/universe/20230906 +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* apply reformat +* refactor: apply formatter with clang-format v14 +* reintroduced clock publshing +* add getSValue function +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* add white space +* apply reformat +* commented clock and parts of concealer +* refactor: apply formatter +* refactor: delete debug messages +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* chore: apply formatter +* fix(TrafficLight): delete relation_id in TrafficLight class and use latest getTrafficLightRelationIDFromWayID +* fix(HDMapUtils): return all relation ids from getTrafficLightRelationIDFromWayID +* apply reformat +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update `makeUpdatedStatus` to take a reference to `PolylineTrajectory` instead of a pointer +* apply reformat +* fix(traffic_simulator/ego): switch a parameter for new architecture_type +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* refactor: delete unused code / dependencies +* feat: add new architecture_type awf/universe/2023.08 +* chore: apply formatter +* refactor: delete unused lines/files +* feat(traffic_simulator): implement conversion from way_id to relation_id +* refactor(traffic_simulator): fix initialization order of member variables in ConfigurableRateUpdater +* chore: apply formatter +* fix(traffic_simulator): fix compile errors +* refactor(traffic_simulator): refactor data flow with simulation_api_schema::TrafficSignal +* refactor(traffic_simulator): refactor ConfigurableRateUpdater +* refactor(traffic_simulator): delete V2ITrafficLightPublisher and use TrafficLightPublisher +* feat(traffic_simulator): use new ConfigurableRateUpdater in TrafficLightMarkerPublisher +* feat(traffic_simulator): implement proto exporting from TrafficLightManager +* feat(traffic_simulator): Add TrafficLightPublisher +* refactor(traffic_simulator): refactor ConfigurableRateUpdater +* refactor(traffic_simulator): delete unused files +* feat(simple_sensor_simulator): add base class for TrafficLightsDetector +* fix(traffic_simulator): fix build errors +* chore(traffic_simulator): reformat +* fix(traffic_simulator): use new message in V2ITrafficLightPublisher +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* fix(traffic_simulator): fix V2ITrafficLightPublisher +* feat(simulation_interface): attachTrafficLightDetectorEmulatorRequest/Response +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* chore(traffic_light): apply ament_clang_format +* refactor(traffic_light): use new architecture_type +* chore(traffic_light): delay creating publisher +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt +* chore(traffic_light): override pure virtual function +* chore(traffic_light): delete empty files +* chore(traffic_light): adapt to variations of traffic light bulb types +* fix(entity_manager): fix errors for traffic light tests +* feat(entity_manager): use new traffic light managers in entity_manager +* feat(traffic_light): add codes for new message +* chore(traffic_light): prepare for runtime topic adaptation +* chore(traffic_light): delete TrafficLightManager type specialization +* chore(traffic_light): rename timers +* chore(traffic_light): set relation_id for new message type +* chore(traffic_light): add template for TrafficLight::Bulb conversion operator +* chore(traffic_light): fix errors +* fix(HDMapUtils): getTrafficLightRelationIDFromWayID +* chore: reformat +* feat(HDMapUtils): getTrafficLightRelationIDFromWayID +* chore(traffic_light): add perception messages for traffic light +* refactor(traffic_light): use TrafficLightBase +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* refactor(traffic_light): use updated function name +* feat(traffic_light): add TrafficLightBase and parameterize msg type of TrafficLight +* refactor(HDMapUtil): rename some functions +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index d14743936db..03c5158f91c 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.1 + 0.8.2 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index c42c0824f44..6da3fe32944 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -53,6 +53,37 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, f0reachARR, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* feat: remove DELETED entity type by using internal id +* feat: add deleted entity to traffic simulator +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index 2c13d4f660d..fe66e4e55cc 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.1 + 0.8.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 ec23f50ec0b..053654ccb16 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -128,6 +128,80 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Tatsuya Yamasaki, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1128 `_ from RobotecAI/fix/random-test-runner-fix + Random test runner fix +* rvalue reference used in executeWithErrorHandling +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Exceptions handling in TestExecutor +* Separate traffic_simulator::API for each TestExecutor +* OccupancyGridSensor attachment and allow_goal_modification parameter declaration +* initialize_duration added to launch file +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* change default port to 5555 +* change default port to 8080 +* change port +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* chore: change architecture_type to awf/universe/20230906 +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat: add new architecture_type awf/universe/2023.08 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 594e78e5ec6..3a717f520fc 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.1 + 0.8.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 92d7ccbda72..372acc1fa27 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -271,6 +271,150 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.2 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1126 `_ from tier4/fix/duplicated_nodes + fix(launch): remove name keyword from nodes in launch file +* update CHANGELOG +* fix(launch): add comment about the change from LifecycleNode to Node +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* fix(launch): remove name keyword from openscenario_interpreter, openscenario_prepreocessor and simples_sensor_simulator nodes +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1121 `_ from tier4/fix/sign-of-relative-distance + Fix/sign of relative distance +* Merge remote-tracking branch 'origin/master' into fix/sign-of-relative-distance +* Merge pull request `#1096 `_ from tier4/feature/deleted-entity + Support for de-spawning entity +* Update test scenario to not expect negative distance for `RelativeDistanceCondition` in non-lane coordinate systems +* feat: update CustomCommandAction.PseudoTrafficSignalDetectorConfidenceSetAction@v1.yaml +* chore: update author of sample scenario +* chore: add example scenario of DeleteEntityAction +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* fix: destination of CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* feat: add continuous rtc action execution in CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* refactor: delete cooperator property from CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* change default port to 5555 +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(simulator_core): use featureIdentifiersRequiringExternalPermissionForAutonomousDecisions instead of manualModules +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1075 `_ from tier4/feature/RJD-96_detail_message_scenario_failure + feat(openscenario_interpreter): Detail the message in case of scenario failure +* change default port to 8080 +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* change port +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* feat: update scenario for new RTC feature +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(test_runner): add FollowTrajectoryAction for bicycle and pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix(test_runner): fix scenarios directory +* feat(scenario_test_runner): add workflow for simulation failure - detailed message +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Initial version of freespace distance condition +* chore: change architecture_type to awf/universe/20230906 +* misc object updated in sample awsim +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* updated npc in awsim_sample scenario +* Update `update` to use `updateStatus` instead of `setStatus` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* added MiscObject to awsim_sample scenario +* fixed map path +* added modifier to awsim sample scenario +* sample awsim scenario added, model3d added to sample vehicle catalogue +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Add new test scenario `RoutingAction.FollowTrajectoryAction-autoware` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat: add new architecture_type awf/universe/2023.08 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index d004ae3ec3a..2e1eeda4e3b 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.1 + 0.8.2 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From 3be7055d91f47e15af824ac1972ee4b58b14cc30 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 12:52:13 +0900 Subject: [PATCH 147/245] enable create release Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index bd4b4f4b7cc..5b7a8bc430f 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -81,11 +81,15 @@ jobs: catkin_generate_changelog -y catkin_tag_changelog --bump major catkin_package_version --bump major + - name: Get new version + id: new_version + run: | + echo "new_version=$(catkin_package_version)" >> $GITHUB_OUTPUT - name: commit changes if: github.event.pull_request.merged == true run: | git add . - git commit -m "Bump version of scenario_simulator_v2 from version ${{ steps.old_version.outputs.old_version }} to version $(catkin_package_version)" + git commit -m "Bump version of scenario_simulator_v2 from version ${{ steps.old_version.outputs.old_version }} to version ${{ steps.new_version.outputs.new_version }}" - name: Pushing to the protected branch 'master' if: github.event.pull_request.merged == true uses: CasperWA/push-protected@v2 @@ -94,6 +98,14 @@ jobs: branch: master force: true - name: Delete branch + if: github.event.pull_request.merged == true uses: SvanBoxel/delete-merged-branch@main env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Create a gitHub release + if: github.event.pull_request.merged == true + uses: ncipollo/release-action@v1 + with: + tag: ${{ steps.new_version.outputs.new_version }} + name: ${{ steps.new_version.outputs.new_version }} + body: Release version ${{ steps.new_version.outputs.new_version }} From a1aa2d2928a11fe41a8c70a640ff76ced4fd1569 Mon Sep 17 00:00:00 2001 From: Release Bot Date: Wed, 24 Jan 2024 03:56:10 +0000 Subject: [PATCH 148/245] Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 --- common/math/arithmetic/CHANGELOG.rst | 27 ++ common/math/arithmetic/package.xml | 2 +- common/math/geometry/CHANGELOG.rst | 154 ++++++++++ common/math/geometry/package.xml | 2 +- .../CHANGELOG.rst | 41 +++ .../scenario_simulator_exception/package.xml | 2 +- common/simple_junit/CHANGELOG.rst | 37 +++ common/simple_junit/package.xml | 2 +- common/status_monitor/CHANGELOG.rst | 26 ++ common/status_monitor/package.xml | 2 +- external/concealer/CHANGELOG.rst | 152 ++++++++++ external/concealer/package.xml | 2 +- map/kashiwanoha_map/CHANGELOG.rst | 26 ++ map/kashiwanoha_map/package.xml | 2 +- mock/cpp_mock_scenarios/CHANGELOG.rst | 105 +++++++ mock/cpp_mock_scenarios/package.xml | 2 +- .../CHANGELOG.rst | 33 +++ .../package.xml | 2 +- .../openscenario_interpreter/CHANGELOG.rst | 163 +++++++++++ .../openscenario_interpreter/package.xml | 2 +- .../CHANGELOG.rst | 26 ++ .../package.xml | 2 +- .../CHANGELOG.rst | 26 ++ .../openscenario_interpreter_msgs/package.xml | 2 +- .../openscenario_preprocessor/CHANGELOG.rst | 36 +++ .../openscenario_preprocessor/package.xml | 2 +- .../CHANGELOG.rst | 30 ++ .../package.xml | 2 +- .../openscenario_utility/CHANGELOG.rst | 26 ++ openscenario/openscenario_utility/package.xml | 2 +- .../openscenario_visualization/CHANGELOG.rst | 26 ++ .../openscenario_visualization/package.xml | 2 +- scenario_simulator_v2/CHANGELOG.rst | 42 +++ scenario_simulator_v2/package.xml | 2 +- simulation/behavior_tree_plugin/CHANGELOG.rst | 95 +++++++ simulation/behavior_tree_plugin/package.xml | 2 +- simulation/do_nothing_plugin/CHANGELOG.rst | 67 +++++ simulation/do_nothing_plugin/package.xml | 2 +- .../simple_sensor_simulator/CHANGELOG.rst | 138 +++++++++ .../simple_sensor_simulator/package.xml | 2 +- simulation/simulation_interface/CHANGELOG.rst | 91 ++++++ simulation/simulation_interface/package.xml | 2 +- simulation/traffic_simulator/CHANGELOG.rst | 264 ++++++++++++++++++ simulation/traffic_simulator/package.xml | 2 +- .../traffic_simulator_msgs/CHANGELOG.rst | 32 +++ simulation/traffic_simulator_msgs/package.xml | 2 +- test_runner/random_test_runner/CHANGELOG.rst | 75 +++++ test_runner/random_test_runner/package.xml | 2 +- .../scenario_test_runner/CHANGELOG.rst | 145 ++++++++++ test_runner/scenario_test_runner/package.xml | 2 +- 50 files changed, 1908 insertions(+), 25 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 6d76841d685..b1a068e6027 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -69,6 +69,33 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index 0fffca617c6..175ea05baaa 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.2 + 0.8.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 b48058a5758..e22291bb1dc 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -448,6 +448,160 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge pull request `#1102 `_ from tier4/fix/wrong_distance + Change possibly wrong subtraction of distance calculation to assignment +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Change subtraction to assignment +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1019 `_ from tier4/feature/fallback_spline_to_line_segments + Feature/fallback spline to line segments +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* fix case +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix format +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* fix typo +* add torelance +* fix getSValue function in line segment class +* add getSValue function +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* use auto +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* add member initializer +* add test case +* fix problem in total_length in CatmullRomSpline class +* use push_back +* add comment +* update comment +* add comment +* fix comment +* fix typo +* add white line +* add white line +* fix typo +* fix typo +* remove plot +* add comment +* udpate comment +* add comment +* add comment +* apply reformat +* update comment +* add gnupolot files +* update comment +* fix comment +* update if +* add comment +* add comment +* add auto scale +* add test case +* fix denormalize +* add comment +* add comment +* add comment +* use auto and -> +* use & +* use auto -> +* remove unused header +* use auto and -> +* add const +* update comment +* add description +* care edge case +* simplify code +* update comment +* update comment +* update comment +* fix typo +* add error message +* add comment +* add test case +* add comment +* add comment +* add comment +* add test case +* update test case +* remove unused function +* add autoscale to the line segment +* update description +* add description +* fix autoscale feature +* add comment +* fix typo +* enable fallback for each functions +* fix some of member function +* add white line for visibility +* add message +* add comment +* remove unused line +* add comment +* add comments +* add comment +* add comment +* add comment +* add test case +* add test case +* add docs +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* add test case +* add test case +* add test case +* fix calculate s value +* fix getLineSegments function +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* enable check collision to the point +* add functions +* simplify code +* add const +* use lambda +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index b01a38ce127..2f8607a9187 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.2 + 0.8.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 acc26c287ce..e0612d163c2 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -109,6 +109,47 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* add define error category +* add SpecificationViolation +* update Doxyfile +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* ref(openscenario_interpreter): revert comments format +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(openscenario_interpreter): inherit ScenarioFailure and tidy up +* feat(openscenario_interpreter): mv ScenarioError, add catch InitActions +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(openscenario_interpreter): improve exception for detail result msg +* feat(openscenario_interpreter): first step detail result msg +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index b78c16e69a9..9887f341e4b 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.2 + 0.8.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 59ec2f170b5..142aebe64dc 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -97,6 +97,43 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* fix typo +* update Doxyfile +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 5240db5d2ed..14e1296f3a9 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.2 + 0.8.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 925895c4c2d..ace64fa5fdf 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -66,6 +66,32 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 4d9f21ec3c3..262a5c45526 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.2 + 0.8.3 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index 332662af949..c9824d7de4e 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -442,6 +442,158 @@ Changelog for package concealer * Add the property `allowGoalModification` to switch destination topics * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* update Doxyfile +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#1106 `_ from tier4/fix/rtc_command_action/continuous_execution + Fix/rtc command action/continuous execution +* Merge pull request `#997 `_ from tier4/feature/allow-goal-modification + Feature/allow goal modification +* doc(concealer): add notes for RTC used status filter +* refactor: service_with_validation.hpp +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* refactor(concealer): delete debug print +* chore(concealer): delete unnecessary line break +* chore(concealer): delete unnecessary line break +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* unnecesary check removed +* fix(concealer): fix capture +* refactor(concealer): add const to requestAutoModeForCooperation +* refactor(concealer): mark isPackageExists as noexcept +* chore(concealer): roll back the number of retries for setVelocityLimit +* chore: update comments +* Move some metafunctions into new header files +* Update `plan` to check that `SetRoutePoints::Requst` has the data member `option` +* removed leftover include +* Cleanup +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* fix(concealer): ignore timeout with engage service +* fix(concealer): set long validation interval for /api/routing/set_route_points +* feat(concealer): support modifying validation interval of ServiceWithValidation +* fix(concealer): allow timeout for requestInitialPose +* feat(concealer): add timeout exception class for ServiceWithValidation +* feat(concealer): enable timeout validation switching for ServiceWithValidation +* feat(concealer): add support for autoware_adapi_v1_msgs::msg::ResponseStatus for service response validation in ServiceWithValidation +* fix(concealer): revive ServiceWithValidation::validateAvailability and fix logic +* added has_include condition for localization state related code +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore(concealer): modify maximum number of retry for set velocity limit service +* refactor: service_with_validation.hpp +* refactor(concealer): organize order of class member variable +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(concealer): organize order of class member variable +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore: apply linter +* refactor(concealer): add is_package_exists.hpp +* refactor(concealer): stop using utility directory +* fix(concealer): fix the history filter of cooperate statuses +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* fix(concealer): fix build errors +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1060 `_ from tier4/AJD-805/baseline_update_rebased + feat: Update topics and services to be compatible with the latest AD API +* fix(concealer): fix failure handling for service response +* clang format +* sending initial pose only when localizaiton is uninitialized +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* fix(concealer): add history filter for rtc command +* chore: apply linter +* feat(concealer): use task_queue to send RTC service request +* feat(concealer): import latest ServiceWithValidation class from RobotecAI's work +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Apply review changes +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: delete cooperator +* fix(concealer): fix compile errors +* feat(concealer): update interface for rtc auto mode +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* feat(concealer): add empty implementation of requestAutoModeForCooperation +* refactor(concealer): delete concealer::cooperate, approve +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix clang format error +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* sending initial pose rate limited +* checkpoints reintroduced +* brought back velocity limit and cooperate commands +* commented clock and parts of concealer +* Run clang format +* Delete comments and new lines +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Regression: revert change operation mode to engage due to engage request after stopping +* Regression: fix autoware state naming +* Regression: stop overriding mrm state and behavior +* Update /autoware/state to /api/iv_msgs/autoware/state OLD AD API +* Implement /api/routing/set_route_points AD API +* Update getTrajectory topic type +* Revert "WIP: get and sets for vehicle status" + This reverts commit bf9d0d2f86fcf729f015ba9312fdc830279a4124. +* WIP: get and sets for vehicle status +* Implement /api/external/get/emergency topic from tier4 external api +* Revert "WIP: add ADAPI support in service with validation" + This reverts commit 944a04fa30e786e79a8517dce88d0bb8b81f207e. +* Implement /api/localization/initialize service for position initialization +* Implement /api/operation_mode/change_to_autonomous to engage +* WIP: add ADAPI support in service with validation +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Cleanup +* Update `concealer` to use service SetRoutePoints +* Add the property `allowGoalModification` to switch destination topics +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/external/concealer/package.xml b/external/concealer/package.xml index a3595185adf..76b62fb19bf 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.2 + 0.8.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/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 14e990e0648..f1c0c042787 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -66,6 +66,32 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index ca44e77bc69..72900d313e4 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.2 + 0.8.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 df492857c17..c31871fd863 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -267,6 +267,111 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#1145 `_ from tier4/feature/random_scenario + Feature/random scenario +* modify default sensor model +* change default vehicle model +* remove unused lambda function +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* fix typo +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* remove debug line +* remove function object +* add spawn_nearby_ego entity +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* fix compile error +* add namespace +* update namespace +* add concealer +* add spawn outside vehicle +* overwrite label from parameter +* enable set label +* rename scenario class +* add namespace +* rename scenario classes +* add namespace +* add cpp_mock_scenarios +* remove debug lines +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* remove sending route function +* remove sending route +* enable run scenario +* update scenario +* Merge branch 'master' into AJD-805/baseline_update_rebased +* add comment +* uncomment targets +* fix scenario +* randomize speed +* despawn stopped pedestrian +* add offset variance parameter +* add s variance +* enable clean up entity +* set bounds +* enable update parameter +* add parameters +* modify condition +* update scenario +* update scenario +* update scenario +* add random scenario +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1080 `_ from tier4/doc/add_comment_for_pr_1074 + add comment about PR `#1074 `_ +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* add comment about PR `#1074 `_ +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index bb6e1cfcbbc..f30e952fb03 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.2 + 0.8.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 317a0a6f787..e58b9fd95a2 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -85,6 +85,39 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* sample awsim scenario added, model3d added to sample vehicle catalogue +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index e75962fab5d..5563648d89f 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.2 + 0.8.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 717366165f5..51c644b5f34 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -468,6 +468,169 @@ Changelog for package openscenario_interpreter * Remove debug prints that were left unintentionally * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1126 `_ from tier4/fix/duplicated_nodes + fix(launch): remove name keyword from nodes in launch file +* update CHANGELOG +* feat(user_defined_value): remove unused functional header +* feat(user_defined_value): add magic subscription counter +* feat(user_defined_value): add hash value based on name, rule, value to the subscription node name +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1121 `_ from tier4/fix/sign-of-relative-distance + Fix/sign of relative distance +* Add comments about the historical background of `RelativeDistanceCondition`'s behavior +* Fix some `RelativeDistanceCondition` mode to return non-negative value +* chore: apply linter +* refactor: renamed 'setTrafficLightConfidence' to 'setConventionalTrafficLightConfidence' +* feat(openscenario_interpreter): add PseudoTrafficSignalDetectorConfidenceSetAction@v1 +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#997 `_ from tier4/feature/allow-goal-modification + Feature/allow goal modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* feat: add error message for featureIdentifiersRequiringExternalPermissionForAutonomousDecisions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* change default port to 5555 +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(simulator_core): use featureIdentifiersRequiringExternalPermissionForAutonomousDecisions instead of manualModules +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1075 `_ from tier4/feature/RJD-96_detail_message_scenario_failure + feat(openscenario_interpreter): Detail the message in case of scenario failure +* change default port to 8080 +* ref(openscenario_interpreter): apply clang format +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): ref SpecialAction +* change port +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* code refactor +* Merge branch 'master' into feature/freespace-distance-condition +* Implement getBoundingBox* functions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* feat(openscenario_interpreter): parse manualModules +* refactor: delete cooperator +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge pull request `#1083 `_ from tier4/fix/distance-condition + fix/distance-condition +* Replace `LaneletId` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* ref(openscenario_interpreter): detailed result msg - last improve +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* ref(openscenario_interpreter): revert missing comment +* ref(openscenario_interpreter): revert comments format +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - third step +* Initial version of freespace distance condition +* remove workbound for galactic +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - second step +* ref(openscenario_interpreter): detailed result msg - improvements after feedback - first step +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* fix: cast result to double in order to correctly compare equals values +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* ref(scenario_failure): remove blank lines +* ref(scenario_failure): remove blank lines +* ref(openscenario_interpreter): improve ScenarioFailure +* feat(openscenario_interpreter): inherit ScenarioFailure and tidy up +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): improve detailed failure message +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* ref(openscenario_interpreter): improve ScenarioFailure +* feat(openscenario_interpreter): mv ScenarioError, add catch InitActions +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat(openscenario_interpreter): attach traffic light detector emulator in applyAssignControllerAction +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(openscenario_interpreter): improve exception for detail result msg +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* feat(openscenario_interpreter): first step detail result msg +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Add the property `allowGoalModification` to switch destination topics +* Remove debug prints that were left unintentionally +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 1ad54de8183..1b41e64a78a 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.2 + 0.8.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 b495857cfa8..4da8be2c494 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -66,6 +66,32 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 2c2271eb320..9bc290187c1 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.2 + 0.8.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 b913e6ec883..7c2471455f4 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -66,6 +66,32 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 35a8c9518d8..e2bc808b53e 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.2 + 0.8.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 385eb9baba8..9767d98d8b7 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -90,6 +90,42 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1126 `_ from tier4/fix/duplicated_nodes + fix(launch): remove name keyword from nodes in launch file +* update CHANGELOG +* fix(launch): remove name keyword from openscenario_interpreter, openscenario_prepreocessor and simples_sensor_simulator nodes +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index faf186c560c..453afa682bc 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.2 + 0.8.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 2d6ecb20d4e..9fa34a8ded6 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -78,6 +78,36 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 252a67ee3b2..6c7019c3166 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.2 + 0.8.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 be40ce64bd7..56ac46a7287 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -66,6 +66,32 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index a8968989fa1..c885dfbb057 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.2 + 0.8.3 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index 4367c63af82..1e2575006f3 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -66,6 +66,32 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index 91dbf4808e4..7496989f463 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.2 + 0.8.3 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 3edf188b6b2..99422bfd6c7 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -204,6 +204,48 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* fix CHANGELOG +* fix changelog +* Merge remote-tracking branch 'test/master' into feature/simplify_action +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#17 `_ from merge-queue-testing/fix/release + add conculency and modify commit message +* fix version +* Merge remote-tracking branch 'test/master' into fix/release +* Bump version of scenario_simulator_v2 to version 0.8.1 +* fix version +* [Bot] Bump version of scenario_simulator_v2 to version 0.8.1 +* Merge pull request `#10 `_ from merge-queue-testing/feature/bump_version_action + add trigger +* fix changelog +* update CHANGELOG +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* bump version of scenario_simulator_v2. +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index b0d9c539898..1b8bb64368d 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.2 + 0.8.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 88e73c0c91e..d1e4df7fc8a 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -270,6 +270,101 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* Merge remote-tracking branch 'origin/master' into feature/deleted-entity +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence +* Merge pull request `#1104 `_ from tier4/fix/entities-right-of-way + Fix/entities right of way +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* fix(action_node): calculate the backward distance in getYieldStopDistance +* fix(action_node): check if is not the same right of way for two diffrent lanelets +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1019 `_ from tier4/feature/fallback_spline_to_line_segments + Feature/fallback spline to line segments +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(behavior_tree): add FollowPolyline action to pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Update `makeUpdatedStatus` to take a reference to `PolylineTrajectory` instead of a pointer +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 10b152b19a2..ddc1ece1c45 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.2 + 0.8.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 04fa7708842..2189a57c883 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -186,6 +186,73 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 38f3a011e97..bc0ad9c6b45 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.2 + 0.8.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 117d1086f68..c2de218915c 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -390,6 +390,144 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge pull request `#1144 `_ from tier4/feature/update_sim_model + Feature/update sim model +* doc: change comment style with note commands +* doc: fix note command place +* chore(simple_sensor_simulator): fix indent +* chore(simple_sensor_simulator): use @note command +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* chore(simple_sensor_simulator): delete acceleration_map.csv +* feat(simple_sensor_simulator): import sim_model_delay_steer_map_acc_geared +* feat(simple_sensor_simulator): import steer dead band feature + https://github.com/autowarefoundation/autoware.universe/pull/5477 +* update CHANGELOG +* refactor: reflect the reviews +* refactor(simple_sensor_simulator): delete name of unused argument to suppress warnings +* change default port to 5555 +* change default port to 8080 +* change port +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* refactor(traffic_simulator): change to a comparison method that is resistant to version changes +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor(simple_sensor_simulator): add explicit keyword to constructor + Co-authored-by: Tatsuya Yamasaki +* refactor(simple_sensor_simulator): TrafficLightDetectorEmulator => PseudoTrafficLightDetector + Co-authored-by: Tatsuya Yamasaki +* refactor(simple_sensor_simulator): TrafficLightDetectorEmulator => PseudoTrafficLightDetector + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* chore: change architecture_type to awf/universe/20230906 +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Update `update` to use `updateStatus` instead of `setStatus` +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update the Ego entity's FollowTrajectoryAction to take into account the vehicle model type +* Update yaw calculation during `FollowTrajectoryAction` for Ego entities +* Rename argument `time` to `current_scenario_time` +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* Merge remote-tracking branch 'origin/ref/RJD-553_restore_repeated_update_entity_status' into pzyskowski/660/ss2-awsim-connection +* Update `EgoEntitySimulation::update` to follow trajectory if is given +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: apply formatter +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update `followPolylineTrajectory` to store the given trajectory to ego +* Simplify member function `ScenarioSimulator::isEgo` +* Simplify member function `ScenarioSimulator::isEntityExists` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* fix(simple_sensor_simulator): update topic name for conventional traffic light +* refactor(simple_sensor_simulator): delete debug code +* refactor(simple_sensor_simulator): move include +* feat: add new architecture_type awf/universe/2023.08 +* refactor: delete unused lines/files +* refactor(simple_sensor_simulator): delete TrafficLightsDetectorBase +* chore: apply formatter +* feat(simple_sensor_simulator): implement ScenarioSimulator::attachTrafficLightDetectorEmulator +* refactor(simple_sensor_simulator): use TrafficLightPublisher in simple_sensor_simulator +* refactor(simple_sensor_simulator): use UpdateTrafficLightsRequest as a type for storing +* feat(simple_sensor_simulator): add base class for TrafficLightsDetector +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Revert "WIP: get and sets for vehicle status" + This reverts commit bf9d0d2f86fcf729f015ba9312fdc830279a4124. +* WIP: get and sets for vehicle status +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 69741486036..6429eed8a5b 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.2 + 0.8.3 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index d5c2acd426f..6e76a7a9e1f 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -261,6 +261,97 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor(simulation_interface) + Co-authored-by: Tatsuya Yamasaki +* refactor(simulation_interface) + Co-authored-by: Tatsuya Yamasaki +* Update simulation/simulation_interface/include/simulation_interface/conversions.hpp + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* chore: apply formatter +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* refactor: apply formatter +* fix: build errors +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* refactor: delete unused code / dependencies +* refactor(simulation_interface): delete unused conversion +* refactor(traffic_simulator): refactor data flow with simulation_api_schema::TrafficSignal +* refactor(simulation_interface/zmq_client): remove duplicated traffic light detector emulator call +* feat(simulator_interface): add support for autoware_msgs +* feat(simulator_interface): add AttachTrafficLightDetectorEmulatorRequest to ZMQ client/server +* chore(traffic_simulator): reformat +* feat(simlation_interface): add call function for AttachTrafficLightDetectorEmulatorRequest +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* feat(simulation_interface): attachTrafficLightDetectorEmulatorRequest/Response +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index fc466eb12df..8ddb9a29212 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.2 + 0.8.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 27e6e261e96..99d0a89968e 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -768,6 +768,270 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#1145 `_ from tier4/feature/random_scenario + Feature/random scenario +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1137 `_ from tier4/fix/RJD-727_fix_orientation_for_inactivity + fix(follow_trajectory): fix orientation for zero velocity vector (inactivity) +* fix(follow_trajectory): fix orientation for norm(v)==0 +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* fix: modify comment in traffic_light.hpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* fix: build errors +* Merge pull request `#1113 `_ from tier4/feature/doxygen + Feature/doxygen +* Merge remote-tracking branch 'origin/master' into fix/sign-of-relative-distance +* Merge pull request `#1096 `_ from tier4/feature/deleted-entity + Support for de-spawning entity +* Update simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/data_type/speed_change.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/data_type/speed_change.hpp + Co-authored-by: Tatsuya Yamasaki +* Update simulation/traffic_simulator/include/traffic_simulator/entity/entity_base.hpp + Co-authored-by: Tatsuya Yamasaki +* add clang-format off +* refactor: reflect the reviews +* update doxyfile +* add simulation package +* add comment +* add spawn outside vehicle +* refactor: renamed 'setTrafficLightConfidence' to 'setConventionalTrafficLightConfidence' +* update Doxyfile +* fix(traffic_simulator): update setTrafficLightConfidence function to handle multiple TrafficLights +* fix(traffic_simulator): fix build errors +* feat(openscenario_interpreter): add PseudoTrafficSignalDetectorConfidenceSetAction@v1 +* feat(traffic_simulator): add EntityManager::setTrafficLightConfidence +* feat(traffic_simulator): move confidence field from Bulb class to TrafficLight class +* feat: invalidate status in deleted entity +* feat: remove DELETED entity type by using internal id +* feat: add deleted entity to traffic simulator +* feat(traffic_simulator): add confidence to Bulb class +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* chore: apply clang_format +* feat(traffic_simualtor): set use_foa=true to use default auto_mode settings +* Merge pull request `#1101 `_ from tier4/fix/standstill_duration + add updateStandStillDuration(step_time) and updateTraveledDistance(st… +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* add updateStandStillDuration(step_time) and updateTraveledDistance(step_time) when the entity failed to match lanelet +* remove debug lines +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* enable clean up entity +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Implement getBoundingBox* functions +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* fix spelling +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1090 `_ from tier4/refactor/lanelet-id + Refactor/lanelet ID +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(behavior_tree): add FollowPolyline action to pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* remove debug line +* fix case +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Rename `gelAllCanonicalizedLaneletPoses` to `get...` +* Cleanup +* Replace `std::vector` with `lanelet::Ids` +* Replace `std::int64_t` with `lanelet::Id` +* Replace `LaneletId` with `lanelet::Id` +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* chore: apply formatter +* refactor(HdMapUtils): rename functions related to traffic light +* refactor(traffic_simulator): change to a comparison method that is resistant to version changes +* refactor(traffic_simulator): delete unnecessary optimization +* fix(traffic_simulator): fix build errors +* chore(traffic_simulator): add LaneletId alias +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* refactor: use better word "thunk" instead of callback + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator): use LaneletId instead of std::int64_t + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator) + Co-authored-by: Tatsuya Yamasaki +* refactor(traffic_simulator) + Co-authored-by: Tatsuya Yamasaki +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* apply reformat +* Initial version of freespace distance condition +* remove workbound for galactic +* chore: apply formatter +* refactor: TrafficLightDetectorEmulator => PseudoTrafficLightDetector +* chore: change architecture_type to awf/universe/20230906 +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* apply reformat +* refactor: apply formatter with clang-format v14 +* reintroduced clock publshing +* add getSValue function +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* add white space +* apply reformat +* commented clock and parts of concealer +* refactor: apply formatter +* refactor: delete debug messages +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/simple_sensor_simulator.hpp + # simulation/simple_sensor_simulator/src/simple_sensor_simulator.cpp + # simulation/simulation_interface/include/simulation_interface/conversions.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_client.hpp + # simulation/simulation_interface/include/simulation_interface/zmq_multi_server.hpp + # simulation/simulation_interface/proto/simulation_api_schema.proto + # simulation/simulation_interface/src/conversions.cpp + # simulation/simulation_interface/src/zmq_multi_client.cpp + # simulation/simulation_interface/src/zmq_multi_server.cpp + # simulation/traffic_simulator/src/api/api.cpp +* chore: apply formatter +* fix(TrafficLight): delete relation_id in TrafficLight class and use latest getTrafficLightRelationIDFromWayID +* fix(HDMapUtils): return all relation ids from getTrafficLightRelationIDFromWayID +* apply reformat +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Update `makeUpdatedStatus` to take a reference to `PolylineTrajectory` instead of a pointer +* apply reformat +* fix(traffic_simulator/ego): switch a parameter for new architecture_type +* fix compile error +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* refactor: delete unused code / dependencies +* feat: add new architecture_type awf/universe/2023.08 +* chore: apply formatter +* refactor: delete unused lines/files +* feat(traffic_simulator): implement conversion from way_id to relation_id +* refactor(traffic_simulator): fix initialization order of member variables in ConfigurableRateUpdater +* chore: apply formatter +* fix(traffic_simulator): fix compile errors +* refactor(traffic_simulator): refactor data flow with simulation_api_schema::TrafficSignal +* refactor(traffic_simulator): refactor ConfigurableRateUpdater +* refactor(traffic_simulator): delete V2ITrafficLightPublisher and use TrafficLightPublisher +* feat(traffic_simulator): use new ConfigurableRateUpdater in TrafficLightMarkerPublisher +* feat(traffic_simulator): implement proto exporting from TrafficLightManager +* feat(traffic_simulator): Add TrafficLightPublisher +* refactor(traffic_simulator): refactor ConfigurableRateUpdater +* refactor(traffic_simulator): delete unused files +* feat(simple_sensor_simulator): add base class for TrafficLightsDetector +* fix(traffic_simulator): fix build errors +* chore(traffic_simulator): reformat +* fix(traffic_simulator): use new message in V2ITrafficLightPublisher +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* fix(traffic_simulator): fix V2ITrafficLightPublisher +* feat(simulation_interface): attachTrafficLightDetectorEmulatorRequest/Response +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* chore(traffic_light): apply ament_clang_format +* refactor(traffic_light): use new architecture_type +* chore(traffic_light): delay creating publisher +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt +* chore(traffic_light): override pure virtual function +* chore(traffic_light): delete empty files +* chore(traffic_light): adapt to variations of traffic light bulb types +* fix(entity_manager): fix errors for traffic light tests +* feat(entity_manager): use new traffic light managers in entity_manager +* feat(traffic_light): add codes for new message +* chore(traffic_light): prepare for runtime topic adaptation +* chore(traffic_light): delete TrafficLightManager type specialization +* chore(traffic_light): rename timers +* chore(traffic_light): set relation_id for new message type +* chore(traffic_light): add template for TrafficLight::Bulb conversion operator +* chore(traffic_light): fix errors +* fix(HDMapUtils): getTrafficLightRelationIDFromWayID +* chore: reformat +* feat(HDMapUtils): getTrafficLightRelationIDFromWayID +* chore(traffic_light): add perception messages for traffic light +* refactor(traffic_light): use TrafficLightBase +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* refactor(traffic_light): use updated function name +* feat(traffic_light): add TrafficLightBase and parameterize msg type of TrafficLight +* refactor(HDMapUtil): rename some functions +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge pull request `#1058 `_ from tier4/ref/RJD-553_restore_repeated_update_entity_status diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index 03c5158f91c..02e52ce143e 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.2 + 0.8.3 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 6da3fe32944..31364528d01 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -84,6 +84,38 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* feat: remove DELETED entity type by using internal id +* feat: add deleted entity to traffic simulator +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into feature/perception_ground_truth diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index fe66e4e55cc..a3954ad36c6 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.2 + 0.8.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 053654ccb16..99936d3308f 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -202,6 +202,81 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1128 `_ from RobotecAI/fix/random-test-runner-fix + Random test runner fix +* rvalue reference used in executeWithErrorHandling +* update CHANGELOG +* Merge branch 'master' into fix/duplicated_nodes +* Exceptions handling in TestExecutor +* Separate traffic_simulator::API for each TestExecutor +* OccupancyGridSensor attachment and allow_goal_modification parameter declaration +* initialize_duration added to launch file +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* chore: suppress warning from boost library +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* change default port to 5555 +* change default port to 8080 +* change port +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support + Feature/drop galactic support +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* remove workbound for galactic +* chore: change architecture_type to awf/universe/20230906 +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp + # simulation/simple_sensor_simulator/src/sensor_simulation/sensor_simulation.cpp + # simulation/traffic_simulator/src/api/api.cpp +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat: add new architecture_type awf/universe/2023.08 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 3a717f520fc..9e04b4d5576 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.2 + 0.8.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 372acc1fa27..fc7bd99a221 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -415,6 +415,151 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.3 (2024-01-24) +------------------ +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* Merge branch 'feature/random_scenario' of https://github.com/tier4/scenario_simulator_v2 into feature/random_scenario +* Merge remote-tracking branch 'origin/master' into feature/random_scenario +* Merge pull request `#1126 `_ from tier4/fix/duplicated_nodes + fix(launch): remove name keyword from nodes in launch file +* update CHANGELOG +* fix(launch): add comment about the change from LifecycleNode to Node +* Merge branch 'master' into fix/duplicated_nodes +* Merge pull request `#1111 `_ from tier4/feature/traffic_light_confidence + Add `PseudoTrafficSignalDetectorConfidenceSetAction@v1` +* fix(launch): remove name keyword from openscenario_interpreter, openscenario_prepreocessor and simples_sensor_simulator nodes +* Merge remote-tracking branch 'origin/master' into feature/traffic_light_confidence + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp +* Merge pull request `#1121 `_ from tier4/fix/sign-of-relative-distance + Fix/sign of relative distance +* Merge remote-tracking branch 'origin/master' into fix/sign-of-relative-distance +* Merge pull request `#1096 `_ from tier4/feature/deleted-entity + Support for de-spawning entity +* Update test scenario to not expect negative distance for `RelativeDistanceCondition` in non-lane coordinate systems +* feat: update CustomCommandAction.PseudoTrafficSignalDetectorConfidenceSetAction@v1.yaml +* chore: update author of sample scenario +* chore: add example scenario of DeleteEntityAction +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into fix/rtc_command_action/continuous_execution +* Merge pull request `#1092 `_ from tier4/feature/control_rtc_auto_mode + Feature/control rtc auto mode +* Merge pull request `#1099 `_ from tier4/pzyskowski/660/ss2-awsim-connection + feat(concealer, scenario_test_runner): ss2/AWSIM connection: initial pose sending upgrade, sample scenario +* Merge pull request `#1098 `_ from tier4/fix/port_document + fix document +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* fix: destination of CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge pull request `#1093 `_ from tier4/feature/RJD-614_follow_trajectory_action_pedestrian_cyclist_support + feat(behavior_tree): follow polyline action for pedestrian and bicycle +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* feat: add continuous rtc action execution in CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* refactor: delete cooperator property from CustomCommandAction.RequestToCooperateCommandAction@v1.yaml +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* change default port to 5555 +* Merge remote-tracking branch 'origin/master' into fix/port_document +* Merge remote-tracking branch 'origin/feature/control_rtc_auto_mode' into fix/rtc_command_action/continuous_execution +* refactor(simulator_core): use featureIdentifiersRequiringExternalPermissionForAutonomousDecisions instead of manualModules +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode + # Conflicts: + # external/concealer/include/concealer/field_operator_application_for_autoware_universe.hpp +* Merge pull request `#1075 `_ from tier4/feature/RJD-96_detail_message_scenario_failure + feat(openscenario_interpreter): Detail the message in case of scenario failure +* change default port to 8080 +* Merge remote-tracking branch 'origin' into feature/RJD-96_detail_message_scenario_failure +* change port +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* Merge branch 'master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge pull request `#1095 `_ from tier4/feature/freespace-distance-condition + Feature/freespace distance condition +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge branch 'master' into feature/freespace-distance-condition +* Merge remote-tracking branch 'origin/master' into pzyskowski/660/ss2-awsim-connection +* code refactor +* implement freespace for relative distance condition +* Init working version of DistanceCondition freespace +* Merge remote-tracking branch 'origin/master' into feature/control_rtc_auto_mode +* feat: update scenario for new RTC feature +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* feat(test_runner): add FollowTrajectoryAction for bicycle and pedestrian +* Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* fix(test_runner): fix scenarios directory +* feat(scenario_test_runner): add workflow for simulation failure - detailed message +* Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 + Feature/traffic simulator/follow trajectory action 3 +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/drop_galactic_support +* Merge pull request `#1027 `_ from tier4/feature/new_traffic_light + Feature/new traffic light +* Merge branch 'master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Initial version of freespace distance condition +* chore: change architecture_type to awf/universe/20230906 +* misc object updated in sample awsim +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* updated npc in awsim_sample scenario +* Update `update` to use `updateStatus` instead of `setStatus` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # docs/ReleaseNotes.md + # simulation/simple_sensor_simulator/include/simple_sensor_simulator/sensor_simulation/sensor_simulation.hpp +* added MiscObject to awsim_sample scenario +* fixed map path +* added modifier to awsim sample scenario +* sample awsim scenario added, model3d added to sample vehicle catalogue +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Add new test scenario `RoutingAction.FollowTrajectoryAction-autoware` +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* refactor: update architecture_type format +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/include/traffic_simulator/api/api.hpp +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light +* feat: add new architecture_type awf/universe/2023.08 +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/new_traffic_light + # Conflicts: + # simulation/traffic_simulator/CMakeLists.txt + # simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/conventional_traffic_light_manager.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/traffic_light_manager_base.hpp + # simulation/traffic_simulator/include/traffic_simulator/traffic_lights/v2i_traffic_light_publisher.hpp + # simulation/traffic_simulator/src/entity/entity_manager.cpp + # simulation/traffic_simulator/src/traffic_lights/traffic_light_manager_base.cpp + # simulation/traffic_simulator/src/traffic_lights/v2i_traffic_light_publisher.cpp +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/fallback_spline_to_line_segments +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification +* Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit + 0.8.0 (2023-09-05) ------------------ * Merge remote-tracking branch 'origin/master' into ref/RJD-553_restore_repeated_update_entity_status diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 2e1eeda4e3b..90637a95ae6 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.2 + 0.8.3 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From 13d12094f75049c18e4a45162406628ccbfe89ff Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 15:05:25 +0900 Subject: [PATCH 149/245] add debug step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 5b7a8bc430f..9bde2784e18 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -109,3 +109,5 @@ jobs: tag: ${{ steps.new_version.outputs.new_version }} name: ${{ steps.new_version.outputs.new_version }} body: Release version ${{ steps.new_version.outputs.new_version }} + - name: debug + run: echo '${{ toJSON(github.event.pull_request) }}' From 2fe0deb76d0601e05bd98edefe64a6f28d8b8323 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 15:12:23 +0900 Subject: [PATCH 150/245] update pluu request template Signed-off-by: Masaya Kataoka --- .github/PULL_REQUEST_TEMPLATE.md | 49 +++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 288303a67e9..017c642f273 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,13 +1,48 @@ -## Types of PR +# PLEASE REMOVE IT AND WRITE TITLE OF YOUR PULL REQUEST -- [ ] New Features -- [ ] Upgrade of existing features -- [ ] Bugfix +## Description 📚 + +### Background + +> Please delete this sentence and explain the circumstances that led to this pull request being sent. + +### Purpose + +> Please delete this sentence and clearly state what new things this pull request will allow you to do or what problems it will solve. + +### Specification + +> Please delete this sentence and describe the specifications of any features added or changed in this pull request. + +### Reference to a key algorithm + +> Please delete this sentence and describe the key algorithm used in the implementation. If there is any novelty, please mention it. + +## Destructive Changes 💥 + +> Please include a description of the changes and a migration guide and send the pull request with a bump major label. (Example : https://github.com/tier4/scenario_simulator_v2/pull/1139) + +> Otherwise, please remove the "Destructive Changes" section and make sure this pull request is labeled `bump minor` or `bump patch`.) + +## Known Limitations 🧨 + +> If there are any limitations on the features or fixes added by this pull request, Please delete this sentence and please clearly describe them. + +> If there are no limitations on the features or modifications added by the pull request, remove the "known limitations" section. ## Link to the issue -## Description +> If a corresponding Issue exists, please delete this sentence and describe its number. + +> If it does not exist, please delete the "Link to the issue" section. + +## Checklist for reviewers ☑️ -## How to review this PR. +All references to "You" in the following text refer to the code reviewer. -## Others + - [ ] Is this pull request written in a way that is easy to read from a third-party perspective? + - [ ] Is there sufficient information (background, purpose, specification, algorithm description, list of disruptive changes, and migration guide) in the description of this pull request? + - [ ] If this pull request contains a destructive change, does this pull request contain the migration guide? + - [ ] Labels of this pull request are valid? + - [ ] All unit tests/integration tests are included in this pull request? If you think adding test cases is unnecessary, please describe why and cross out this line. + - [ ] The documentation is enough? If you think adding documents for this pull request, is unnecessary, please describe why and cross out this line. From 6e53b38e844cbc05f114b5ad5c090dc1b35436a5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 15:33:06 +0900 Subject: [PATCH 151/245] add post check list action Signed-off-by: Masaya Kataoka --- .github/PULL_REQUEST_TEMPLATE.md | 11 ----------- .github/workflows/PostCheckList.yaml | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/PostCheckList.yaml diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 017c642f273..b740c6cf86a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -35,14 +35,3 @@ > If a corresponding Issue exists, please delete this sentence and describe its number. > If it does not exist, please delete the "Link to the issue" section. - -## Checklist for reviewers ☑️ - -All references to "You" in the following text refer to the code reviewer. - - - [ ] Is this pull request written in a way that is easy to read from a third-party perspective? - - [ ] Is there sufficient information (background, purpose, specification, algorithm description, list of disruptive changes, and migration guide) in the description of this pull request? - - [ ] If this pull request contains a destructive change, does this pull request contain the migration guide? - - [ ] Labels of this pull request are valid? - - [ ] All unit tests/integration tests are included in this pull request? If you think adding test cases is unnecessary, please describe why and cross out this line. - - [ ] The documentation is enough? If you think adding documents for this pull request, is unnecessary, please describe why and cross out this line. diff --git a/.github/workflows/PostCheckList.yaml b/.github/workflows/PostCheckList.yaml new file mode 100644 index 00000000000..b976b3a541c --- /dev/null +++ b/.github/workflows/PostCheckList.yaml @@ -0,0 +1,26 @@ +name: PostCheckList +on: + pull_request: + branches: + - master + types: [opened, reopened] + +jobs: + post_check_list: + name: PostCheckList + timeout-minutes: 10 + runs-on: ubuntu-22.04 + steps: + - uses: zt4ff/auto-commmenter@v2 + with: + type: custom + body: | + # Checklist for reviewers ☑️ + All references to "You" in the following text refer to the code reviewer. + + - [ ] Is this pull request written in a way that is easy to read from a third-party perspective? + - [ ] Is there sufficient information (background, purpose, specification, algorithm description, list of disruptive changes, and migration guide) in the description of this pull request? + - [ ] If this pull request contains a destructive change, does this pull request contain the migration guide? + - [ ] Labels of this pull request are valid? + - [ ] All unit tests/integration tests are included in this pull request? If you think adding test cases is unnecessary, please describe why and cross out this line. + - [ ] The documentation is enough? If you think adding documents for this pull request, is unnecessary, please describe why and cross out this line. From 4ab47bfe9cb5c187fd80769ca889b44a7f39ad80 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 15:36:20 +0900 Subject: [PATCH 152/245] modify action Signed-off-by: Masaya Kataoka --- .github/workflows/PostCheckList.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/PostCheckList.yaml b/.github/workflows/PostCheckList.yaml index b976b3a541c..5d40f90ebd1 100644 --- a/.github/workflows/PostCheckList.yaml +++ b/.github/workflows/PostCheckList.yaml @@ -17,7 +17,6 @@ jobs: body: | # Checklist for reviewers ☑️ All references to "You" in the following text refer to the code reviewer. - - [ ] Is this pull request written in a way that is easy to read from a third-party perspective? - [ ] Is there sufficient information (background, purpose, specification, algorithm description, list of disruptive changes, and migration guide) in the description of this pull request? - [ ] If this pull request contains a destructive change, does this pull request contain the migration guide? From d03a358302772ebec1e243734d1dbd11db126c0b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 15:39:48 +0900 Subject: [PATCH 153/245] fix typo Signed-off-by: Masaya Kataoka --- .github/workflows/PostCheckList.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/PostCheckList.yaml b/.github/workflows/PostCheckList.yaml index 5d40f90ebd1..f59481ee69b 100644 --- a/.github/workflows/PostCheckList.yaml +++ b/.github/workflows/PostCheckList.yaml @@ -11,7 +11,7 @@ jobs: timeout-minutes: 10 runs-on: ubuntu-22.04 steps: - - uses: zt4ff/auto-commmenter@v2 + - uses: zt4ff/auto-commenter@v2 with: type: custom body: | From 3d01a94ef0638be604a1b4935367e3df73dae83b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 15:40:09 +0900 Subject: [PATCH 154/245] fix debug Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 9bde2784e18..f51f37cb5c1 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -110,4 +110,4 @@ jobs: name: ${{ steps.new_version.outputs.new_version }} body: Release version ${{ steps.new_version.outputs.new_version }} - name: debug - run: echo '${{ toJSON(github.event.pull_request) }}' + run: echo '${{ toJSON(github.event.pull_request.body) }}' From ff6a353b1ceea13faf9c3acd1b531f49aff599af Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 15:42:50 +0900 Subject: [PATCH 155/245] modify permission Signed-off-by: Masaya Kataoka --- .github/workflows/PostCheckList.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/PostCheckList.yaml b/.github/workflows/PostCheckList.yaml index f59481ee69b..6aa86a1e376 100644 --- a/.github/workflows/PostCheckList.yaml +++ b/.github/workflows/PostCheckList.yaml @@ -10,6 +10,8 @@ jobs: name: PostCheckList timeout-minutes: 10 runs-on: ubuntu-22.04 + permissions: + pull-requests: write steps: - uses: zt4ff/auto-commenter@v2 with: @@ -23,3 +25,4 @@ jobs: - [ ] Labels of this pull request are valid? - [ ] All unit tests/integration tests are included in this pull request? If you think adding test cases is unnecessary, please describe why and cross out this line. - [ ] The documentation is enough? If you think adding documents for this pull request, is unnecessary, please describe why and cross out this line. + token: ${{ secrets.GITHUB_TOKEN }} From ece4574aa5602516cd811a17558d1a4d92fe6ff8 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 15:44:05 +0900 Subject: [PATCH 156/245] add permission Signed-off-by: Masaya Kataoka --- .github/workflows/PostCheckList.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/PostCheckList.yaml b/.github/workflows/PostCheckList.yaml index 6aa86a1e376..e108d3d2829 100644 --- a/.github/workflows/PostCheckList.yaml +++ b/.github/workflows/PostCheckList.yaml @@ -11,7 +11,16 @@ jobs: timeout-minutes: 10 runs-on: ubuntu-22.04 permissions: + actions: write + checks: write + contents: write + deployments: write + issues: write + packages: write pull-requests: write + repository-projects: write + security-events: write + statuses: write steps: - uses: zt4ff/auto-commenter@v2 with: From c21ad9421fc3d28e8fa1ced68c59e081a618c538 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 15:53:52 +0900 Subject: [PATCH 157/245] change action Signed-off-by: Masaya Kataoka --- .github/workflows/PostCheckList.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/PostCheckList.yaml b/.github/workflows/PostCheckList.yaml index e108d3d2829..19436dec256 100644 --- a/.github/workflows/PostCheckList.yaml +++ b/.github/workflows/PostCheckList.yaml @@ -22,10 +22,9 @@ jobs: security-events: write statuses: write steps: - - uses: zt4ff/auto-commenter@v2 + - uses: alawiii521/current-pr-comment@v1.0 with: - type: custom - body: | + comment: | # Checklist for reviewers ☑️ All references to "You" in the following text refer to the code reviewer. - [ ] Is this pull request written in a way that is easy to read from a third-party perspective? @@ -34,4 +33,4 @@ jobs: - [ ] Labels of this pull request are valid? - [ ] All unit tests/integration tests are included in this pull request? If you think adding test cases is unnecessary, please describe why and cross out this line. - [ ] The documentation is enough? If you think adding documents for this pull request, is unnecessary, please describe why and cross out this line. - token: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 5f0460ba857d6f70c8a32d97ad630771febb35c5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 15:59:18 +0900 Subject: [PATCH 158/245] add body Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index f51f37cb5c1..3db9e7c77b7 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -108,6 +108,6 @@ jobs: with: tag: ${{ steps.new_version.outputs.new_version }} name: ${{ steps.new_version.outputs.new_version }} - body: Release version ${{ steps.new_version.outputs.new_version }} + body: github.event.pull_request.body - name: debug - run: echo '${{ toJSON(github.event.pull_request.body) }}' + run: echo '${{ toJSON(github.event.pull_request) }}' From 683078c99ba2a31b4d7ca2e14f6612577e3f532c Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 16:16:21 +0900 Subject: [PATCH 159/245] update debug Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 3db9e7c77b7..0d81a479fc3 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -102,6 +102,16 @@ jobs: uses: SvanBoxel/delete-merged-branch@main env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get linked issues + # if: github.event.pull_request.merged == true + id: linked_issues + uses: hossainemruz/linked-issues@main + with: + pr_url: ${{github.event.pull_request.html_url}} + format: IssueURL + - name: debug + run: | + echo ${{ format('result: {0} {1}', github.event.pull_request.body, '\n## Linked Issues\n${{ steps.linked_issues.outputs.issues }}') }} - name: Create a gitHub release if: github.event.pull_request.merged == true uses: ncipollo/release-action@v1 @@ -109,5 +119,3 @@ jobs: tag: ${{ steps.new_version.outputs.new_version }} name: ${{ steps.new_version.outputs.new_version }} body: github.event.pull_request.body - - name: debug - run: echo '${{ toJSON(github.event.pull_request) }}' From 2eb659021ba54660881686f85ed4a2fb60448ed8 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 16:20:26 +0900 Subject: [PATCH 160/245] use ExternalIssueRef: Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 0d81a479fc3..f74bfd7762c 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -108,7 +108,7 @@ jobs: uses: hossainemruz/linked-issues@main with: pr_url: ${{github.event.pull_request.html_url}} - format: IssueURL + format: ExternalIssueRef - name: debug run: | echo ${{ format('result: {0} {1}', github.event.pull_request.body, '\n## Linked Issues\n${{ steps.linked_issues.outputs.issues }}') }} From 7e0c9f7889e343f3fc0c9602d27ddb573fce91bc Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 16:23:29 +0900 Subject: [PATCH 161/245] change action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index f74bfd7762c..fb0efc6e252 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -105,10 +105,9 @@ jobs: - name: Get linked issues # if: github.event.pull_request.merged == true id: linked_issues - uses: hossainemruz/linked-issues@main - with: - pr_url: ${{github.event.pull_request.html_url}} - format: ExternalIssueRef + uses: mondeja/pr-linked-issues-action@v2 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: debug run: | echo ${{ format('result: {0} {1}', github.event.pull_request.body, '\n## Linked Issues\n${{ steps.linked_issues.outputs.issues }}') }} From 7d67389e6b2d4e24ba29df1dcf11009238c3ffe5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 16:37:53 +0900 Subject: [PATCH 162/245] use combile action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index fb0efc6e252..661e8377465 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -108,9 +108,17 @@ jobs: uses: mondeja/pr-linked-issues-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Combine strings + uses: michpohl/action-concatenate-strings@v1 + with: + first: github.event.pull_request.body + second: | + ## Linked Issues\n${{ steps.linked_issues.outputs.issues }} + separator: ', ' + output-var-name: 'release_description' - name: debug run: | - echo ${{ format('result: {0} {1}', github.event.pull_request.body, '\n## Linked Issues\n${{ steps.linked_issues.outputs.issues }}') }} + echo ${{ steps.linked_issues.outputs.release_description }} - name: Create a gitHub release if: github.event.pull_request.merged == true uses: ncipollo/release-action@v1 From e71e8a2698af346b163554da13daec984c959220 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 16:38:38 +0900 Subject: [PATCH 163/245] fix separator Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 661e8377465..17b9352f75d 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -114,7 +114,7 @@ jobs: first: github.event.pull_request.body second: | ## Linked Issues\n${{ steps.linked_issues.outputs.issues }} - separator: ', ' + separator: '\n' output-var-name: 'release_description' - name: debug run: | From 9ca3c587b11d84ac809ee4292469c734f2f87727 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 16:39:48 +0900 Subject: [PATCH 164/245] change action version Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 17b9352f75d..31a9b14b259 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -109,7 +109,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Combine strings - uses: michpohl/action-concatenate-strings@v1 + uses: michpohl/action-concatenate-strings@v1.0.1 with: first: github.event.pull_request.body second: | From 7f3d463876768d978626d6947dcbda973785b173 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 16:44:50 +0900 Subject: [PATCH 165/245] add ${{ }} Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 31a9b14b259..84a0f3b963a 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -111,7 +111,7 @@ jobs: - name: Combine strings uses: michpohl/action-concatenate-strings@v1.0.1 with: - first: github.event.pull_request.body + first: ${{ github.event.pull_request.body }} second: | ## Linked Issues\n${{ steps.linked_issues.outputs.issues }} separator: '\n' From 61985b268ac36f812a3d4f0b6919270726e16cb2 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 16:51:35 +0900 Subject: [PATCH 166/245] change var name Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 84a0f3b963a..62297a0e99a 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -115,10 +115,10 @@ jobs: second: | ## Linked Issues\n${{ steps.linked_issues.outputs.issues }} separator: '\n' - output-var-name: 'release_description' + output-var-name: 'RELEASE_DESCRIPTION' - name: debug run: | - echo ${{ steps.linked_issues.outputs.release_description }} + echo ${{ steps.linked_issues.outputs.RELEASE_DESCRIPTION }} - name: Create a gitHub release if: github.event.pull_request.merged == true uses: ncipollo/release-action@v1 From 25fa55b76f00d1bf1f1e0a497d08f1a2d9d7348f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 16:57:32 +0900 Subject: [PATCH 167/245] modify debug Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 62297a0e99a..6b82bd9acc5 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -116,9 +116,11 @@ jobs: ## Linked Issues\n${{ steps.linked_issues.outputs.issues }} separator: '\n' output-var-name: 'RELEASE_DESCRIPTION' + # - name: debug + # run: | + # echo ${{ steps.linked_issues.outputs.RELEASE_DESCRIPTION }} - name: debug - run: | - echo ${{ steps.linked_issues.outputs.RELEASE_DESCRIPTION }} + run: echo ${{ steps.linked_issues.outputs.issues }} - name: Create a gitHub release if: github.event.pull_request.merged == true uses: ncipollo/release-action@v1 From 69649fadb30ef3363e9c3ac7d8d26521a987466b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 17:00:40 +0900 Subject: [PATCH 168/245] fix release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 6b82bd9acc5..6bba261f944 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -113,8 +113,10 @@ jobs: with: first: ${{ github.event.pull_request.body }} second: | - ## Linked Issues\n${{ steps.linked_issues.outputs.issues }} - separator: '\n' + + ## Linked Issues + + ${{ steps.linked_issues.outputs.issues }} output-var-name: 'RELEASE_DESCRIPTION' # - name: debug # run: | From a7a7b8ed958a16250899cdb3b262a7d5e7f01e63 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 17:06:45 +0900 Subject: [PATCH 169/245] remove last section Signed-off-by: Masaya Kataoka --- .github/PULL_REQUEST_TEMPLATE.md | 6 ------ .github/workflows/Release.yaml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b740c6cf86a..9a0bbe43d8b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -29,9 +29,3 @@ > If there are any limitations on the features or fixes added by this pull request, Please delete this sentence and please clearly describe them. > If there are no limitations on the features or modifications added by the pull request, remove the "known limitations" section. - -## Link to the issue - -> If a corresponding Issue exists, please delete this sentence and describe its number. - -> If it does not exist, please delete the "Link to the issue" section. diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 6bba261f944..e60f6151dcf 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -129,4 +129,4 @@ jobs: with: tag: ${{ steps.new_version.outputs.new_version }} name: ${{ steps.new_version.outputs.new_version }} - body: github.event.pull_request.body + body: $RELEASE_DESCRIPTION From 2dc9d4b6d637bc316054fbcc5a5044e8e07e5381 Mon Sep 17 00:00:00 2001 From: Release Bot Date: Wed, 24 Jan 2024 08:12:38 +0000 Subject: [PATCH 170/245] Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 --- 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 +- 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/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/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 +- openscenario/openscenario_visualization/CHANGELOG.rst | 3 +++ openscenario/openscenario_visualization/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 +- 50 files changed, 100 insertions(+), 25 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index b1a068e6027..8ab1f9df319 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -69,6 +69,9 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index 175ea05baaa..4030f902827 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.3 + 0.8.4 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 e22291bb1dc..f68a37e7434 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -448,6 +448,9 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index 2f8607a9187..885d0d77b8f 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.3 + 0.8.4 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 e0612d163c2..ba87841e2a6 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -109,6 +109,9 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 9887f341e4b..6c254e632a1 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.3 + 0.8.4 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 142aebe64dc..f9e428c4419 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -97,6 +97,9 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 14e1296f3a9..83aa09ed61e 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.3 + 0.8.4 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 ace64fa5fdf..bfa18c23950 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 262a5c45526..46875c4b7c6 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.3 + 0.8.4 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index c9824d7de4e..989d707053a 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -442,6 +442,9 @@ Changelog for package concealer * Add the property `allowGoalModification` to switch destination topics * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 76b62fb19bf..2a97b8c386f 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.3 + 0.8.4 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index f1c0c042787..6aa6b85e1b6 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 72900d313e4..9d96cae9fd9 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.3 + 0.8.4 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 c31871fd863..ed3cf05e37f 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -267,6 +267,9 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index f30e952fb03..c7d2e82387b 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.3 + 0.8.4 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 e58b9fd95a2..d744a5f0d93 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -85,6 +85,9 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 5563648d89f..95a8f645f88 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.3 + 0.8.4 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 51c644b5f34..0e40046f432 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -468,6 +468,9 @@ Changelog for package openscenario_interpreter * Remove debug prints that were left unintentionally * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 1b41e64a78a..dfdd8ebde35 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.3 + 0.8.4 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 4da8be2c494..563cebb7fa4 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 9bc290187c1..4493d7d36fd 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.3 + 0.8.4 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 7c2471455f4..62b32f8d5d7 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index e2bc808b53e..e31446d9a9e 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.3 + 0.8.4 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 9767d98d8b7..8f47c71ee73 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -90,6 +90,9 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index 453afa682bc..fdd21adae94 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.3 + 0.8.4 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 9fa34a8ded6..577342f326e 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -78,6 +78,9 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 6c7019c3166..728acf2df79 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.3 + 0.8.4 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 56ac46a7287..5d73e92060a 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index c885dfbb057..13d9e93ab40 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.3 + 0.8.4 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index 1e2575006f3..ab1b868ff51 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index 7496989f463..92598d14999 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.3 + 0.8.4 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 99422bfd6c7..9dd7b1849c1 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -204,6 +204,9 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 1b8bb64368d..2c38c31bf5c 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.3 + 0.8.4 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 d1e4df7fc8a..016b692f5b9 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -270,6 +270,9 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index ddc1ece1c45..01e362dcbb7 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.3 + 0.8.4 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 2189a57c883..f7163231918 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -186,6 +186,9 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index bc0ad9c6b45..27e8b4e1dd5 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.3 + 0.8.4 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 c2de218915c..d201915277b 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -390,6 +390,9 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 6429eed8a5b..fa4cd6e160f 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.3 + 0.8.4 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 6e76a7a9e1f..ad83829fc17 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -261,6 +261,9 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 8ddb9a29212..ef19b2f48ac 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.3 + 0.8.4 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 99d0a89968e..b6364191501 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -768,6 +768,9 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index 02e52ce143e..c4a6f9b7f57 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.3 + 0.8.4 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 31364528d01..1994a9d7f68 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -84,6 +84,9 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index a3954ad36c6..ab538a4b8b4 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.3 + 0.8.4 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 99936d3308f..12e8ba86675 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -202,6 +202,9 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 9e04b4d5576..985dc407d37 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.3 + 0.8.4 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 fc7bd99a221..3eac88fdb73 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -415,6 +415,9 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.4 (2024-01-24) +------------------ + 0.8.3 (2024-01-24) ------------------ * Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 90637a95ae6..89801e35455 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.3 + 0.8.4 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From bad703d2f717163ac62964b841afee604474c716 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 17:14:53 +0900 Subject: [PATCH 171/245] update workflow Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index e60f6151dcf..da5d843bf59 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -129,4 +129,4 @@ jobs: with: tag: ${{ steps.new_version.outputs.new_version }} name: ${{ steps.new_version.outputs.new_version }} - body: $RELEASE_DESCRIPTION + body: ${{ env.RELEASE_DESCRIPTION }} From 350342d37dca2ec2a63ce9db5a581c83bcb80156 Mon Sep 17 00:00:00 2001 From: Release Bot Date: Wed, 24 Jan 2024 08:20:53 +0000 Subject: [PATCH 172/245] Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 --- 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 +- 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/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/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 +- openscenario/openscenario_visualization/CHANGELOG.rst | 3 +++ openscenario/openscenario_visualization/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 +- 50 files changed, 100 insertions(+), 25 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 8ab1f9df319..6dec3692a26 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -69,6 +69,9 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index 4030f902827..731f290a01a 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.4 + 0.8.5 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 f68a37e7434..88abf0bdae2 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -448,6 +448,9 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index 885d0d77b8f..da212bca697 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.4 + 0.8.5 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 ba87841e2a6..3426e34acb7 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -109,6 +109,9 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 6c254e632a1..7ef90087bcc 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.4 + 0.8.5 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 f9e428c4419..4aee4092d52 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -97,6 +97,9 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 83aa09ed61e..f87289b1527 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.4 + 0.8.5 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 bfa18c23950..121d3ae797d 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 46875c4b7c6..3bdb2eaa1d8 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.4 + 0.8.5 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index 989d707053a..f9b2bb497ab 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -442,6 +442,9 @@ Changelog for package concealer * Add the property `allowGoalModification` to switch destination topics * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 2a97b8c386f..c0c42dbf7da 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.4 + 0.8.5 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 6aa6b85e1b6..7c32703085c 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 9d96cae9fd9..ead2611d6a6 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.4 + 0.8.5 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 ed3cf05e37f..0431a44304a 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -267,6 +267,9 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index c7d2e82387b..42866e5275d 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.4 + 0.8.5 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 d744a5f0d93..45184520966 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -85,6 +85,9 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 95a8f645f88..abedd1d2829 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.4 + 0.8.5 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 0e40046f432..7f752193d8b 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -468,6 +468,9 @@ Changelog for package openscenario_interpreter * Remove debug prints that were left unintentionally * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index dfdd8ebde35..f9e9d2009a3 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.4 + 0.8.5 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 563cebb7fa4..6a2d88bcbce 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 4493d7d36fd..b6730174a2b 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.4 + 0.8.5 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 62b32f8d5d7..f91f415db84 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index e31446d9a9e..cff311fd98e 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.4 + 0.8.5 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 8f47c71ee73..83d770fc546 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -90,6 +90,9 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index fdd21adae94..90ce196c11f 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.4 + 0.8.5 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 577342f326e..9389cd92608 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -78,6 +78,9 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 728acf2df79..5c26255c6c4 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.4 + 0.8.5 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 5d73e92060a..c680e4bac5d 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 13d9e93ab40..e8e12d59594 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.4 + 0.8.5 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index ab1b868ff51..0c9fbd57036 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index 92598d14999..ab5f8b8276f 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.4 + 0.8.5 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 9dd7b1849c1..a41475c3db9 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -204,6 +204,9 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 2c38c31bf5c..f5aa92350dd 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.4 + 0.8.5 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 016b692f5b9..9eeed7d9377 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -270,6 +270,9 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 01e362dcbb7..f5b243c6827 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.4 + 0.8.5 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 f7163231918..20d2d828ae8 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -186,6 +186,9 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 27e8b4e1dd5..3bd44249c24 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.4 + 0.8.5 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 d201915277b..4ff08a4e306 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -390,6 +390,9 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index fa4cd6e160f..8250eb91301 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.4 + 0.8.5 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index ad83829fc17..bb2b39743e2 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -261,6 +261,9 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index ef19b2f48ac..d29b73520f9 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.4 + 0.8.5 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 b6364191501..96374cb8a1d 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -768,6 +768,9 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index c4a6f9b7f57..eb21688facf 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.4 + 0.8.5 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 1994a9d7f68..a325aae6304 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -84,6 +84,9 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index ab538a4b8b4..dea39665706 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.4 + 0.8.5 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 12e8ba86675..06ec0085f63 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -202,6 +202,9 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 985dc407d37..76deb60d40a 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.4 + 0.8.5 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 3eac88fdb73..4628a661ff6 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -415,6 +415,9 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.5 (2024-01-24) +------------------ + 0.8.4 (2024-01-24) ------------------ diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 89801e35455..8d4d3db9d6e 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.4 + 0.8.5 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From 4883f26b3b9480c7d2f1151c0dcdad254ef2420e Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 17:24:37 +0900 Subject: [PATCH 173/245] fix release workflow Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index da5d843bf59..4052ab27089 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -113,11 +113,10 @@ jobs: with: first: ${{ github.event.pull_request.body }} second: | - - ## Linked Issues - + ## Linked Issues ${{ steps.linked_issues.outputs.issues }} output-var-name: 'RELEASE_DESCRIPTION' + separator: '\n' # - name: debug # run: | # echo ${{ steps.linked_issues.outputs.RELEASE_DESCRIPTION }} From cdcac59fceb43813f5f3bf760690b6f7ac836b95 Mon Sep 17 00:00:00 2001 From: Release Bot Date: Wed, 24 Jan 2024 08:29:45 +0000 Subject: [PATCH 174/245] Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 --- common/math/arithmetic/CHANGELOG.rst | 5 +++++ common/math/arithmetic/package.xml | 2 +- common/math/geometry/CHANGELOG.rst | 5 +++++ common/math/geometry/package.xml | 2 +- common/scenario_simulator_exception/CHANGELOG.rst | 5 +++++ common/scenario_simulator_exception/package.xml | 2 +- common/simple_junit/CHANGELOG.rst | 5 +++++ common/simple_junit/package.xml | 2 +- common/status_monitor/CHANGELOG.rst | 5 +++++ common/status_monitor/package.xml | 2 +- external/concealer/CHANGELOG.rst | 5 +++++ external/concealer/package.xml | 2 +- map/kashiwanoha_map/CHANGELOG.rst | 5 +++++ map/kashiwanoha_map/package.xml | 2 +- mock/cpp_mock_scenarios/CHANGELOG.rst | 5 +++++ mock/cpp_mock_scenarios/package.xml | 2 +- openscenario/openscenario_experimental_catalog/CHANGELOG.rst | 5 +++++ openscenario/openscenario_experimental_catalog/package.xml | 2 +- openscenario/openscenario_interpreter/CHANGELOG.rst | 5 +++++ openscenario/openscenario_interpreter/package.xml | 2 +- openscenario/openscenario_interpreter_example/CHANGELOG.rst | 5 +++++ openscenario/openscenario_interpreter_example/package.xml | 2 +- openscenario/openscenario_interpreter_msgs/CHANGELOG.rst | 5 +++++ openscenario/openscenario_interpreter_msgs/package.xml | 2 +- openscenario/openscenario_preprocessor/CHANGELOG.rst | 5 +++++ openscenario/openscenario_preprocessor/package.xml | 2 +- openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst | 5 +++++ openscenario/openscenario_preprocessor_msgs/package.xml | 2 +- openscenario/openscenario_utility/CHANGELOG.rst | 5 +++++ openscenario/openscenario_utility/package.xml | 2 +- openscenario/openscenario_visualization/CHANGELOG.rst | 5 +++++ openscenario/openscenario_visualization/package.xml | 2 +- scenario_simulator_v2/CHANGELOG.rst | 5 +++++ scenario_simulator_v2/package.xml | 2 +- simulation/behavior_tree_plugin/CHANGELOG.rst | 5 +++++ simulation/behavior_tree_plugin/package.xml | 2 +- simulation/do_nothing_plugin/CHANGELOG.rst | 5 +++++ simulation/do_nothing_plugin/package.xml | 2 +- simulation/simple_sensor_simulator/CHANGELOG.rst | 5 +++++ simulation/simple_sensor_simulator/package.xml | 2 +- simulation/simulation_interface/CHANGELOG.rst | 5 +++++ simulation/simulation_interface/package.xml | 2 +- simulation/traffic_simulator/CHANGELOG.rst | 5 +++++ simulation/traffic_simulator/package.xml | 2 +- simulation/traffic_simulator_msgs/CHANGELOG.rst | 5 +++++ simulation/traffic_simulator_msgs/package.xml | 2 +- test_runner/random_test_runner/CHANGELOG.rst | 5 +++++ test_runner/random_test_runner/package.xml | 2 +- test_runner/scenario_test_runner/CHANGELOG.rst | 5 +++++ test_runner/scenario_test_runner/package.xml | 2 +- 50 files changed, 150 insertions(+), 25 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 6dec3692a26..70986eaeecc 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -69,6 +69,11 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index 731f290a01a..738866c4644 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.5 + 0.8.6 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 88abf0bdae2..f75d3481546 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -448,6 +448,11 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index da212bca697..e8b2921c4cf 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.5 + 0.8.6 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 3426e34acb7..f8cb3d0f1c9 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -109,6 +109,11 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 7ef90087bcc..34863b7a6aa 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.5 + 0.8.6 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 4aee4092d52..99945aaa18e 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -97,6 +97,11 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index f87289b1527..272c472c335 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.5 + 0.8.6 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 121d3ae797d..64f25c2ed39 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 3bdb2eaa1d8..3bd6c38089e 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.5 + 0.8.6 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index f9b2bb497ab..08a94938e08 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -442,6 +442,11 @@ Changelog for package concealer * Add the property `allowGoalModification` to switch destination topics * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/external/concealer/package.xml b/external/concealer/package.xml index c0c42dbf7da..c507cd31b96 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.5 + 0.8.6 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 7c32703085c..41b2317db4c 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index ead2611d6a6..6282be39d5f 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.5 + 0.8.6 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 0431a44304a..736a312e0ea 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -267,6 +267,11 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index 42866e5275d..e9edbb55ff9 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.5 + 0.8.6 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 45184520966..de23dcb1c7f 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -85,6 +85,11 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index abedd1d2829..35398922a34 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.5 + 0.8.6 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 7f752193d8b..7c9a79a64d3 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -468,6 +468,11 @@ Changelog for package openscenario_interpreter * Remove debug prints that were left unintentionally * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index f9e9d2009a3..14d7fb18b09 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.5 + 0.8.6 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 6a2d88bcbce..35dde42004a 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index b6730174a2b..3bd0ca063a2 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.5 + 0.8.6 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 f91f415db84..209041a2345 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index cff311fd98e..8674eefcfe4 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.5 + 0.8.6 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 83d770fc546..c7361b290a2 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -90,6 +90,11 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index 90ce196c11f..5cf6231e4cf 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.5 + 0.8.6 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 9389cd92608..ad741360fe1 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -78,6 +78,11 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 5c26255c6c4..c70cbd2ec91 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.5 + 0.8.6 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 c680e4bac5d..48ba647f0cd 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index e8e12d59594..4c248097664 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.5 + 0.8.6 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index 0c9fbd57036..96215817a5a 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index ab5f8b8276f..8c9e62ce1c6 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.5 + 0.8.6 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index a41475c3db9..02bcfc579df 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -204,6 +204,11 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index f5aa92350dd..d520828834a 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.5 + 0.8.6 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 9eeed7d9377..65285ec6ef8 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -270,6 +270,11 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index f5b243c6827..dcac065e25c 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.5 + 0.8.6 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 20d2d828ae8..e1b30e76b1d 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -186,6 +186,11 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 3bd44249c24..8f4964a5b70 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.5 + 0.8.6 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 4ff08a4e306..8513ff48bc0 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -390,6 +390,11 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 8250eb91301..3ec05c40cc7 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.5 + 0.8.6 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index bb2b39743e2..138802cb5e4 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -261,6 +261,11 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index d29b73520f9..c51ea1b2f74 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.5 + 0.8.6 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 96374cb8a1d..e6cc00620b1 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -768,6 +768,11 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index eb21688facf..eeb7dfa56c5 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.5 + 0.8.6 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index a325aae6304..fe1b205e0f8 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -84,6 +84,11 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index dea39665706..9e4e26eadab 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.5 + 0.8.6 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 06ec0085f63..28fe7d98997 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -202,6 +202,11 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 76deb60d40a..362eb767ee6 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.5 + 0.8.6 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 4628a661ff6..e94cb307094 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -415,6 +415,11 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.6 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.5 (2024-01-24) ------------------ diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 8d4d3db9d6e..f6b9cce7cfe 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.5 + 0.8.6 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From b72a911cb36ddd98b1cc4276e92c4b0e160bf181 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 17:34:14 +0900 Subject: [PATCH 175/245] change separator Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 4052ab27089..14647b07daf 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -116,7 +116,7 @@ jobs: ## Linked Issues ${{ steps.linked_issues.outputs.issues }} output-var-name: 'RELEASE_DESCRIPTION' - separator: '\n' + separator: ' ' # - name: debug # run: | # echo ${{ steps.linked_issues.outputs.RELEASE_DESCRIPTION }} From 7568c95c3f117cc4a4634f10ea0dd1bfce73a44c Mon Sep 17 00:00:00 2001 From: Release Bot Date: Wed, 24 Jan 2024 08:38:20 +0000 Subject: [PATCH 176/245] Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 --- common/math/arithmetic/CHANGELOG.rst | 5 +++++ common/math/arithmetic/package.xml | 2 +- common/math/geometry/CHANGELOG.rst | 5 +++++ common/math/geometry/package.xml | 2 +- common/scenario_simulator_exception/CHANGELOG.rst | 5 +++++ common/scenario_simulator_exception/package.xml | 2 +- common/simple_junit/CHANGELOG.rst | 5 +++++ common/simple_junit/package.xml | 2 +- common/status_monitor/CHANGELOG.rst | 5 +++++ common/status_monitor/package.xml | 2 +- external/concealer/CHANGELOG.rst | 5 +++++ external/concealer/package.xml | 2 +- map/kashiwanoha_map/CHANGELOG.rst | 5 +++++ map/kashiwanoha_map/package.xml | 2 +- mock/cpp_mock_scenarios/CHANGELOG.rst | 5 +++++ mock/cpp_mock_scenarios/package.xml | 2 +- openscenario/openscenario_experimental_catalog/CHANGELOG.rst | 5 +++++ openscenario/openscenario_experimental_catalog/package.xml | 2 +- openscenario/openscenario_interpreter/CHANGELOG.rst | 5 +++++ openscenario/openscenario_interpreter/package.xml | 2 +- openscenario/openscenario_interpreter_example/CHANGELOG.rst | 5 +++++ openscenario/openscenario_interpreter_example/package.xml | 2 +- openscenario/openscenario_interpreter_msgs/CHANGELOG.rst | 5 +++++ openscenario/openscenario_interpreter_msgs/package.xml | 2 +- openscenario/openscenario_preprocessor/CHANGELOG.rst | 5 +++++ openscenario/openscenario_preprocessor/package.xml | 2 +- openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst | 5 +++++ openscenario/openscenario_preprocessor_msgs/package.xml | 2 +- openscenario/openscenario_utility/CHANGELOG.rst | 5 +++++ openscenario/openscenario_utility/package.xml | 2 +- openscenario/openscenario_visualization/CHANGELOG.rst | 5 +++++ openscenario/openscenario_visualization/package.xml | 2 +- scenario_simulator_v2/CHANGELOG.rst | 5 +++++ scenario_simulator_v2/package.xml | 2 +- simulation/behavior_tree_plugin/CHANGELOG.rst | 5 +++++ simulation/behavior_tree_plugin/package.xml | 2 +- simulation/do_nothing_plugin/CHANGELOG.rst | 5 +++++ simulation/do_nothing_plugin/package.xml | 2 +- simulation/simple_sensor_simulator/CHANGELOG.rst | 5 +++++ simulation/simple_sensor_simulator/package.xml | 2 +- simulation/simulation_interface/CHANGELOG.rst | 5 +++++ simulation/simulation_interface/package.xml | 2 +- simulation/traffic_simulator/CHANGELOG.rst | 5 +++++ simulation/traffic_simulator/package.xml | 2 +- simulation/traffic_simulator_msgs/CHANGELOG.rst | 5 +++++ simulation/traffic_simulator_msgs/package.xml | 2 +- test_runner/random_test_runner/CHANGELOG.rst | 5 +++++ test_runner/random_test_runner/package.xml | 2 +- test_runner/scenario_test_runner/CHANGELOG.rst | 5 +++++ test_runner/scenario_test_runner/package.xml | 2 +- 50 files changed, 150 insertions(+), 25 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 70986eaeecc..e10bd8dd2b9 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -69,6 +69,11 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index 738866c4644..d71f489a3e7 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.6 + 0.8.7 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 f75d3481546..9de2d86aef4 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -448,6 +448,11 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index e8b2921c4cf..d9cf677e532 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.6 + 0.8.7 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 f8cb3d0f1c9..4146b7acfb7 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -109,6 +109,11 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 34863b7a6aa..74d14818b7c 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.6 + 0.8.7 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 99945aaa18e..5a1f001b1c9 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -97,6 +97,11 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 272c472c335..eac5c8822ed 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.6 + 0.8.7 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 64f25c2ed39..e8156ad3b37 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 3bd6c38089e..89c73dd5184 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.6 + 0.8.7 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index 08a94938e08..eef37ab46b6 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -442,6 +442,11 @@ Changelog for package concealer * Add the property `allowGoalModification` to switch destination topics * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/external/concealer/package.xml b/external/concealer/package.xml index c507cd31b96..9010f209a3a 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.6 + 0.8.7 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 41b2317db4c..ec7f0964c10 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 6282be39d5f..a2be12ed7cb 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.6 + 0.8.7 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 736a312e0ea..7f67a9528d5 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -267,6 +267,11 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index e9edbb55ff9..23ab80a39aa 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.6 + 0.8.7 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 de23dcb1c7f..e849d3daf3b 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -85,6 +85,11 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 35398922a34..3023c055bd9 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.6 + 0.8.7 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 7c9a79a64d3..c5165a6a785 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -468,6 +468,11 @@ Changelog for package openscenario_interpreter * Remove debug prints that were left unintentionally * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 14d7fb18b09..8803c68f679 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.6 + 0.8.7 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 35dde42004a..d2f90cc68f6 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 3bd0ca063a2..d4b59b91e97 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.6 + 0.8.7 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 209041a2345..668668e5831 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 8674eefcfe4..c0e25114b49 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.6 + 0.8.7 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 c7361b290a2..dac7f916dee 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -90,6 +90,11 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index 5cf6231e4cf..5c58fee469b 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.6 + 0.8.7 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 ad741360fe1..ad2da3f7cbb 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -78,6 +78,11 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index c70cbd2ec91..73a3d7ea5de 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.6 + 0.8.7 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 48ba647f0cd..074568fc887 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 4c248097664..0781a0bf366 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.6 + 0.8.7 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index 96215817a5a..ec794493000 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -66,6 +66,11 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index 8c9e62ce1c6..86c56c6ab56 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.6 + 0.8.7 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 02bcfc579df..abb29e19993 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -204,6 +204,11 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index d520828834a..5b29dfe5d3b 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.6 + 0.8.7 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 65285ec6ef8..f87eadef51b 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -270,6 +270,11 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index dcac065e25c..50356d22063 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.6 + 0.8.7 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 e1b30e76b1d..6b5004985ba 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -186,6 +186,11 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 8f4964a5b70..4303d0578ae 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.6 + 0.8.7 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 8513ff48bc0..5fb0252049e 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -390,6 +390,11 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 3ec05c40cc7..541107fd326 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.6 + 0.8.7 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 138802cb5e4..9152fd0db05 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -261,6 +261,11 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index c51ea1b2f74..5004df8aeff 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.6 + 0.8.7 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 e6cc00620b1..6bc7d1cf001 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -768,6 +768,11 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index eeb7dfa56c5..5eda6b4f0e6 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.6 + 0.8.7 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index fe1b205e0f8..d6a21e49d6a 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -84,6 +84,11 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index 9e4e26eadab..868188f5e57 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.6 + 0.8.7 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 28fe7d98997..59e7401fb65 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -202,6 +202,11 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 362eb767ee6..b367f8bc524 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.6 + 0.8.7 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 e94cb307094..05e6c6dd477 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -415,6 +415,11 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.7 (2024-01-24) +------------------ +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Contributors: Masaya Kataoka + 0.8.6 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index f6b9cce7cfe..19e474ef4fc 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.6 + 0.8.7 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From ee02aab52dc31506c8143c106ea26cf88e90fc77 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 17:53:16 +0900 Subject: [PATCH 177/245] update release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 14647b07daf..d1772608118 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -108,6 +108,9 @@ jobs: uses: mondeja/pr-linked-issues-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Build description + run: | + echo ${{ format(github.event.pull_request.body, " ## Pull request number #30") }} - name: Combine strings uses: michpohl/action-concatenate-strings@v1.0.1 with: From fa061a151b256e8cc7734affd7333c23bca0e931 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 17:55:55 +0900 Subject: [PATCH 178/245] use single quatation Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index d1772608118..735df5bf3b8 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -110,7 +110,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build description run: | - echo ${{ format(github.event.pull_request.body, " ## Pull request number #30") }} + echo ${{ format(github.event.pull_request.body, ` ## Pull request number #30`) }} - name: Combine strings uses: michpohl/action-concatenate-strings@v1.0.1 with: From 396478d056b9d5c4f7fadf5bb7756495870cb1aa Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 17:58:45 +0900 Subject: [PATCH 179/245] update release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 735df5bf3b8..66e84a563ba 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -110,7 +110,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build description run: | - echo ${{ format(github.event.pull_request.body, ` ## Pull request number #30`) }} + ${{ format('{0} {1}', ${{ github.event.pull_request.body }}, '## Pull request number #30') }} - name: Combine strings uses: michpohl/action-concatenate-strings@v1.0.1 with: From 5db90b455101a96fd643fc16406894d1ada9881f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 17:59:22 +0900 Subject: [PATCH 180/245] remove ${{ }} Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 66e84a563ba..88f5d94c2ca 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -110,7 +110,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build description run: | - ${{ format('{0} {1}', ${{ github.event.pull_request.body }}, '## Pull request number #30') }} + ${{ format('{0} {1}', github.event.pull_request.body, '## Pull request number #30') }} - name: Combine strings uses: michpohl/action-concatenate-strings@v1.0.1 with: From a80099c7113d3112cd4fc3b04caa95920d20740a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 18:03:52 +0900 Subject: [PATCH 181/245] update release action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 88f5d94c2ca..be8ac5de6ae 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -109,8 +109,11 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Build description + id: build_description run: | - ${{ format('{0} {1}', github.event.pull_request.body, '## Pull request number #30') }} + echo description=${{ format('{0} {1}', github.event.pull_request.body, '## Pull request number #30') }} >> $GITHUB_OUTPUT + - name: Print description + run: echo ${{ steps.build_description.outputs.description }} - name: Combine strings uses: michpohl/action-concatenate-strings@v1.0.1 with: From 42fee1d68b228178a50adbfa42927d6335865b9a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 18:15:53 +0900 Subject: [PATCH 182/245] change action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index be8ac5de6ae..af93213cb2d 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -108,30 +108,25 @@ jobs: uses: mondeja/pr-linked-issues-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Build description - id: build_description - run: | - echo description=${{ format('{0} {1}', github.event.pull_request.body, '## Pull request number #30') }} >> $GITHUB_OUTPUT - - name: Print description - run: echo ${{ steps.build_description.outputs.description }} - name: Combine strings - uses: michpohl/action-concatenate-strings@v1.0.1 - with: - first: ${{ github.event.pull_request.body }} - second: | + # if: github.event.pull_request.merged == true + id: release_description + uses: greguintow/concat-string-action@v1 + env: + linked_issue_section: | ## Linked Issues ${{ steps.linked_issues.outputs.issues }} - output-var-name: 'RELEASE_DESCRIPTION' - separator: ' ' - # - name: debug - # run: | - # echo ${{ steps.linked_issues.outputs.RELEASE_DESCRIPTION }} + with: + string: | + ${{ github.event.pull_request.body }} + {linked_issue_section} - name: debug - run: echo ${{ steps.linked_issues.outputs.issues }} + # if: github.event.pull_request.merged == true + run: echo ${{ steps.release_description.outputs.replaced }} - name: Create a gitHub release if: github.event.pull_request.merged == true uses: ncipollo/release-action@v1 with: tag: ${{ steps.new_version.outputs.new_version }} name: ${{ steps.new_version.outputs.new_version }} - body: ${{ env.RELEASE_DESCRIPTION }} + body: ${{ steps.release_description.outputs.replaced }} From 5fc67e28a889c6181863e2d23b2bdf0855deab67 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 18:21:13 +0900 Subject: [PATCH 183/245] save as text Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index af93213cb2d..fb28741e022 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -114,15 +114,21 @@ jobs: uses: greguintow/concat-string-action@v1 env: linked_issue_section: | - ## Linked Issues ${{ steps.linked_issues.outputs.issues }} with: string: | - ${{ github.event.pull_request.body }} + ${{ github.event.pull_request.body }} + ## Linked Issues {linked_issue_section} - name: debug # if: github.event.pull_request.merged == true - run: echo ${{ steps.release_description.outputs.replaced }} + run: ${{ steps.release_description.outputs.replaced }} >> release_description.txt + - name: Upload artifact + # if: github.event.pull_request.merged == true + uses: actions/upload-artifact@v4 + with: + name: release_description + path: release_description.txt - name: Create a gitHub release if: github.event.pull_request.merged == true uses: ncipollo/release-action@v1 From a36808ee71bc7407948b7ebc602c94ac6c0efaa9 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 18:26:07 +0900 Subject: [PATCH 184/245] add echo Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index fb28741e022..910452c1646 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -122,7 +122,7 @@ jobs: {linked_issue_section} - name: debug # if: github.event.pull_request.merged == true - run: ${{ steps.release_description.outputs.replaced }} >> release_description.txt + run: echo "${{ steps.release_description.outputs.replaced }}" >> release_description.txt - name: Upload artifact # if: github.event.pull_request.merged == true uses: actions/upload-artifact@v4 From 21f7f7768b721570269cef19626b4f607130c155 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 18:37:23 +0900 Subject: [PATCH 185/245] modify linked issue section Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 910452c1646..2ac65af0fc2 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -114,21 +114,16 @@ jobs: uses: greguintow/concat-string-action@v1 env: linked_issue_section: | - ${{ steps.linked_issues.outputs.issues }} + #26 + # ${{ steps.linked_issues.outputs.issues }} with: string: | ${{ github.event.pull_request.body }} ## Linked Issues {linked_issue_section} - - name: debug + - name: Print release description # if: github.event.pull_request.merged == true - run: echo "${{ steps.release_description.outputs.replaced }}" >> release_description.txt - - name: Upload artifact - # if: github.event.pull_request.merged == true - uses: actions/upload-artifact@v4 - with: - name: release_description - path: release_description.txt + run: echo "${{ steps.release_description.outputs.replaced }}" - name: Create a gitHub release if: github.event.pull_request.merged == true uses: ncipollo/release-action@v1 From 842afdacd86806a935a4b97908d8e65db608a57a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 18:58:03 +0900 Subject: [PATCH 186/245] use echo command Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 2ac65af0fc2..56e6b8f2075 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -55,14 +55,6 @@ jobs: echo "old_version=$(catkin_package_version)" >> $GITHUB_OUTPUT - name: Merge branch run: git pull origin ${{ github.head_ref }} - - name: Get labels of the pull request - id: get_label - uses: fml09/get-label@v0.1.1 - with: - pull_number: ${{ steps.get_pull_request_number.outputs.group1 }} - repo: scenario_simulator_v2 - owner: merge-queue-testing - token: ${{ secrets.GITHUB_TOKEN }} - name: bump patch version if: (contains(github.event.pull_request.labels.*.name, 'bump patch')) run: | @@ -108,22 +100,13 @@ jobs: uses: mondeja/pr-linked-issues-action@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Combine strings + - name: Update release description # if: github.event.pull_request.merged == true - id: release_description - uses: greguintow/concat-string-action@v1 - env: - linked_issue_section: | - #26 - # ${{ steps.linked_issues.outputs.issues }} - with: - string: | - ${{ github.event.pull_request.body }} - ## Linked Issues - {linked_issue_section} - - name: Print release description - # if: github.event.pull_request.merged == true - run: echo "${{ steps.release_description.outputs.replaced }}" + run: | + echo "${{ github.event.pull_request.body }}" >> pull_request_description.txt + echo "## Related Issues " >> pull_request_description.txt + echo "${{ steps.linked_issues.outputs.issues }}" + cat pull_request_description.txt - name: Create a gitHub release if: github.event.pull_request.merged == true uses: ncipollo/release-action@v1 From 4ab0d190abd04d1ab6790ddb428e90ece942ee38 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 19:05:00 +0900 Subject: [PATCH 187/245] fix description Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 56e6b8f2075..01d80911859 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -101,16 +101,20 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update release description + id: get_release_description # if: github.event.pull_request.merged == true run: | - echo "${{ github.event.pull_request.body }}" >> pull_request_description.txt - echo "## Related Issues " >> pull_request_description.txt + echo "${{ github.event.pull_request.body }}" >> release_description.txt + echo "## Pull Request " >> release_description.txt + echo "${{ github.event.pull_request.number }}" >> release_description.txt + echo "## Related Issues " >> release_description.txt echo "${{ steps.linked_issues.outputs.issues }}" - cat pull_request_description.txt + cat release_description.txt + echo "description=$(cat release_description.txt)" >> $GITHUB_OUTPUT - name: Create a gitHub release if: github.event.pull_request.merged == true uses: ncipollo/release-action@v1 with: tag: ${{ steps.new_version.outputs.new_version }} name: ${{ steps.new_version.outputs.new_version }} - body: ${{ steps.release_description.outputs.replaced }} + body: ${{ steps.get_release_description.outputs.description }} From 4961af2551f8c20c28ab243424494f2721bbc5b2 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 19:07:21 +0900 Subject: [PATCH 188/245] add output Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 01d80911859..9b2075a72f6 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -108,7 +108,7 @@ jobs: echo "## Pull Request " >> release_description.txt echo "${{ github.event.pull_request.number }}" >> release_description.txt echo "## Related Issues " >> release_description.txt - echo "${{ steps.linked_issues.outputs.issues }}" + echo "${{ steps.linked_issues.outputs.issues }}" >> release_description.txt cat release_description.txt echo "description=$(cat release_description.txt)" >> $GITHUB_OUTPUT - name: Create a gitHub release From 0b320c8ef8a5434c1ac3d787518edb9fa0baab2c Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 19:10:02 +0900 Subject: [PATCH 189/245] remove some description Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 9b2075a72f6..ab6b898fbac 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -106,8 +106,6 @@ jobs: run: | echo "${{ github.event.pull_request.body }}" >> release_description.txt echo "## Pull Request " >> release_description.txt - echo "${{ github.event.pull_request.number }}" >> release_description.txt - echo "## Related Issues " >> release_description.txt echo "${{ steps.linked_issues.outputs.issues }}" >> release_description.txt cat release_description.txt echo "description=$(cat release_description.txt)" >> $GITHUB_OUTPUT From 6a7aaef9942c2b61bff4c74a58888a37afaee2d8 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 19:10:25 +0900 Subject: [PATCH 190/245] remove cat step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index ab6b898fbac..3e74d1424ab 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -106,8 +106,9 @@ jobs: run: | echo "${{ github.event.pull_request.body }}" >> release_description.txt echo "## Pull Request " >> release_description.txt + echo "${{ github.event.pull_request.number }}" >> release_description.txt + echo "## Related Issues " >> release_description.txt echo "${{ steps.linked_issues.outputs.issues }}" >> release_description.txt - cat release_description.txt echo "description=$(cat release_description.txt)" >> $GITHUB_OUTPUT - name: Create a gitHub release if: github.event.pull_request.merged == true From e5b50b599a8d434bd097cd5bb93ed6e3eff886cc Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 19:13:21 +0900 Subject: [PATCH 191/245] remove output step Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 3e74d1424ab..f1dcd50b8e6 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -109,7 +109,6 @@ jobs: echo "${{ github.event.pull_request.number }}" >> release_description.txt echo "## Related Issues " >> release_description.txt echo "${{ steps.linked_issues.outputs.issues }}" >> release_description.txt - echo "description=$(cat release_description.txt)" >> $GITHUB_OUTPUT - name: Create a gitHub release if: github.event.pull_request.merged == true uses: ncipollo/release-action@v1 From a830f8420e0a37fef36aff17c1b3f8667a6bc7ad Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 19:18:45 +0900 Subject: [PATCH 192/245] use command output action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index f1dcd50b8e6..58e05959fd6 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -101,7 +101,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update release description - id: get_release_description # if: github.event.pull_request.merged == true run: | echo "${{ github.event.pull_request.body }}" >> release_description.txt @@ -109,10 +108,16 @@ jobs: echo "${{ github.event.pull_request.number }}" >> release_description.txt echo "## Related Issues " >> release_description.txt echo "${{ steps.linked_issues.outputs.issues }}" >> release_description.txt + - name: Get release description + # if: github.event.pull_request.merged == true + id: get_release_description + uses: mathiasvr/command-output@v2.0.0 + with: + run: cat release_description.txt - name: Create a gitHub release if: github.event.pull_request.merged == true uses: ncipollo/release-action@v1 with: tag: ${{ steps.new_version.outputs.new_version }} name: ${{ steps.new_version.outputs.new_version }} - body: ${{ steps.get_release_description.outputs.description }} + body: ${{ steps.get_release_description.outputs.stdout }} From 68d453dce14b2f434b8570b6f88cce54e20ec074 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 19:30:21 +0900 Subject: [PATCH 193/245] add white line Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 58e05959fd6..a49e9161dde 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -104,8 +104,10 @@ jobs: # if: github.event.pull_request.merged == true run: | echo "${{ github.event.pull_request.body }}" >> release_description.txt + echo "" >> release_description.txt echo "## Pull Request " >> release_description.txt - echo "${{ github.event.pull_request.number }}" >> release_description.txt + echo "#${{ github.event.pull_request.number }}" >> release_description.txt + echo "" >> release_description.txt echo "## Related Issues " >> release_description.txt echo "${{ steps.linked_issues.outputs.issues }}" >> release_description.txt - name: Get release description From 7be74b4c1f9ba9060afb61506057a39ec42cd1ae Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 19:37:00 +0900 Subject: [PATCH 194/245] change action order Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index a49e9161dde..78234872c38 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -89,11 +89,6 @@ jobs: token: ${{ secrets.BLOOM_GITHUB_TOKEN }} branch: master force: true - - name: Delete branch - if: github.event.pull_request.merged == true - uses: SvanBoxel/delete-merged-branch@main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Get linked issues # if: github.event.pull_request.merged == true id: linked_issues @@ -123,3 +118,8 @@ jobs: tag: ${{ steps.new_version.outputs.new_version }} name: ${{ steps.new_version.outputs.new_version }} body: ${{ steps.get_release_description.outputs.stdout }} + - name: Delete branch + if: github.event.pull_request.merged == true + uses: SvanBoxel/delete-merged-branch@main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 56d7ce2b6e04e0999353b36824da62073d3eb934 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 19:51:00 +0900 Subject: [PATCH 195/245] empty commit Signed-off-by: Masaya Kataoka From 917d7b5b0246009ce94b1e88ecfa2733aaf13110 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 20:00:12 +0900 Subject: [PATCH 196/245] change link issue action Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 78234872c38..1a7a684f8e6 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -92,9 +92,10 @@ jobs: - name: Get linked issues # if: github.event.pull_request.merged == true id: linked_issues - uses: mondeja/pr-linked-issues-action@v2 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + uses: hossainemruz/linked-issues@main + with: + pr_url: ${{github.event.pull_request.html_url}} + format: ExternalIssueRef - name: Update release description # if: github.event.pull_request.merged == true run: | From 34ef059d177e248930a9997e104e72cfccc3ae6d Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 24 Jan 2024 20:05:54 +0900 Subject: [PATCH 197/245] simplify code Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 1a7a684f8e6..df2fe532e68 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -90,14 +90,12 @@ jobs: branch: master force: true - name: Get linked issues - # if: github.event.pull_request.merged == true id: linked_issues uses: hossainemruz/linked-issues@main with: pr_url: ${{github.event.pull_request.html_url}} format: ExternalIssueRef - name: Update release description - # if: github.event.pull_request.merged == true run: | echo "${{ github.event.pull_request.body }}" >> release_description.txt echo "" >> release_description.txt @@ -107,7 +105,6 @@ jobs: echo "## Related Issues " >> release_description.txt echo "${{ steps.linked_issues.outputs.issues }}" >> release_description.txt - name: Get release description - # if: github.event.pull_request.merged == true id: get_release_description uses: mathiasvr/command-output@v2.0.0 with: From 06c9ae53733ae2a27ae1add4479dc770b4d407ac Mon Sep 17 00:00:00 2001 From: Release Bot Date: Wed, 24 Jan 2024 11:11:24 +0000 Subject: [PATCH 198/245] Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 --- 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 +- 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/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/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 +- openscenario/openscenario_visualization/CHANGELOG.rst | 3 +++ openscenario/openscenario_visualization/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 +- 50 files changed, 100 insertions(+), 25 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index e10bd8dd2b9..19e6d0b8064 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -69,6 +69,9 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index d71f489a3e7..fa4138d93d2 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.7 + 0.8.8 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 9de2d86aef4..3638b762e74 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -448,6 +448,9 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index d9cf677e532..c13ce9b4680 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.7 + 0.8.8 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 4146b7acfb7..875f29eccb6 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -109,6 +109,9 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 74d14818b7c..5b2d0f24413 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.7 + 0.8.8 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 5a1f001b1c9..eda912b8c73 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -97,6 +97,9 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index eac5c8822ed..848488c052f 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.7 + 0.8.8 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 e8156ad3b37..6effa6b96d1 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 89c73dd5184..f38e80e1649 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.7 + 0.8.8 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index eef37ab46b6..2fe74acc476 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -442,6 +442,9 @@ Changelog for package concealer * Add the property `allowGoalModification` to switch destination topics * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 9010f209a3a..50c8a83a0aa 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.7 + 0.8.8 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index ec7f0964c10..641ed3be5ca 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index a2be12ed7cb..c2a4af4979f 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.7 + 0.8.8 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 7f67a9528d5..6871fc8045a 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -267,6 +267,9 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index 23ab80a39aa..c71048d4543 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.7 + 0.8.8 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 e849d3daf3b..1b601c90d0a 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -85,6 +85,9 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 3023c055bd9..8b1e8213553 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.7 + 0.8.8 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 c5165a6a785..b114cf8b1e7 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -468,6 +468,9 @@ Changelog for package openscenario_interpreter * Remove debug prints that were left unintentionally * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 8803c68f679..4c607f913b4 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.7 + 0.8.8 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 d2f90cc68f6..8afa07fea87 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index d4b59b91e97..69f33107544 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.7 + 0.8.8 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 668668e5831..a3f71dc1379 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index c0e25114b49..cab8413ed2a 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.7 + 0.8.8 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 dac7f916dee..457a1eff876 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -90,6 +90,9 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index 5c58fee469b..40345decbb9 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.7 + 0.8.8 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 ad2da3f7cbb..15be31206ec 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -78,6 +78,9 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 73a3d7ea5de..d3b8360711f 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.7 + 0.8.8 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 074568fc887..8248207a6dc 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 0781a0bf366..5a286e7ab16 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.7 + 0.8.8 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index ec794493000..24edf950d1f 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index 86c56c6ab56..48ce800c5c9 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.7 + 0.8.8 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index abb29e19993..357de96cc6f 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -204,6 +204,9 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 5b29dfe5d3b..0b2847b5847 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.7 + 0.8.8 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 f87eadef51b..970a95552d6 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -270,6 +270,9 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 50356d22063..644cfb5fe2e 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.7 + 0.8.8 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 6b5004985ba..f86d794b6fe 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -186,6 +186,9 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 4303d0578ae..32dc9b22463 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.7 + 0.8.8 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 5fb0252049e..c42de82b6e9 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -390,6 +390,9 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 541107fd326..196eeea67b0 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.7 + 0.8.8 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 9152fd0db05..47927d030ca 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -261,6 +261,9 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 5004df8aeff..719ae319848 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.7 + 0.8.8 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 6bc7d1cf001..65ede108c7c 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -768,6 +768,9 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index 5eda6b4f0e6..e527f56d0c0 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.7 + 0.8.8 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index d6a21e49d6a..dbee7ab9199 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -84,6 +84,9 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index 868188f5e57..319426eab2a 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.7 + 0.8.8 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 59e7401fb65..477e5dc7f41 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -202,6 +202,9 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index b367f8bc524..e0a72dac91d 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.7 + 0.8.8 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 05e6c6dd477..4e25bee53bf 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -415,6 +415,9 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.8 (2024-01-24) +------------------ + 0.8.7 (2024-01-24) ------------------ * Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 19e474ef4fc..c548a31c884 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.7 + 0.8.8 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From b3cb8f9683cffa14ad7baa6185ace1cba9f9d12f Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 25 Jan 2024 14:59:03 +0900 Subject: [PATCH 199/245] update pull request template Signed-off-by: Masaya Kataoka --- .github/PULL_REQUEST_TEMPLATE.md | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9a0bbe43d8b..7e458c65e3e 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,21 +2,22 @@ ## Description 📚 -### Background +### Abstract -> Please delete this sentence and explain the circumstances that led to this pull request being sent. +> Please delete this sentence and explain this pull request shortly. -### Purpose +### Background -> Please delete this sentence and clearly state what new things this pull request will allow you to do or what problems it will solve. +> Please delete this sentence and explain the circumstances that led to this pull request being sent. +### Details -### Specification +> Please delete this sentence and describe this pull request. -> Please delete this sentence and describe the specifications of any features added or changed in this pull request. +> For example, it is desirable to describe the specifications of added functions and functions, and detailed explanations of bugs that have been fixed. -### Reference to a key algorithm +### References -> Please delete this sentence and describe the key algorithm used in the implementation. If there is any novelty, please mention it. +> Please describe any standards, algorithms, books, articles, etc. that you referenced when creating the pull request. If there is any novelty, please mention it. ## Destructive Changes 💥 @@ -29,3 +30,9 @@ > If there are any limitations on the features or fixes added by this pull request, Please delete this sentence and please clearly describe them. > If there are no limitations on the features or modifications added by the pull request, remove the "known limitations" section. + +> For example, the lane matching algorithm currently (1/25/2024) employed is unable to match Entity that is heavily tilted with respect to the lane, and it is difficult to throw an exception. + +> If the developer is aware of the existence of such problems or limitations, describe them in detail. + +> The problems or limitation should be listed as an Issue on Github and a link to it should be provided in this section. From 7f5f95683158928448e89aad659bc86c3c1d2d3e Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 25 Jan 2024 15:00:54 +0900 Subject: [PATCH 200/245] update issue template Signed-off-by: Masaya Kataoka --- .github/ISSUE_TEMPLATE/bug_report.md | 3 +-- .github/ISSUE_TEMPLATE/release.md | 13 ------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/release.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 880cdaf86e4..4b652b077cf 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,8 +24,7 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Desktop (please complete the following information):** - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] + - OS: [e.g. ubuntu 22.04] - Version [e.g. 22] - ROS 2 version - DDS diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md deleted file mode 100644 index 8afe53b63d0..00000000000 --- a/.github/ISSUE_TEMPLATE/release.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -name: Release -about: Describe this issue template's purpose here. -title: Release [Version] -labels: release -assignees: hakuturu583 - ---- - -Please check below before sending this issue. - -- [ ] Did you update [ReleaseNotes.md?](https://github.com/tier4/scenario_simulator_v2/blob/master/docs/ReleaseNotes.md) -- [ ] Issue title is valid? (example : Release 0.2.0) From b1550f230ffefe383448d8be805dc14c2a442a8b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 25 Jan 2024 15:44:33 +0900 Subject: [PATCH 201/245] fix pull request template Signed-off-by: Masaya Kataoka --- .github/PULL_REQUEST_TEMPLATE.md | 18 ++++++++---------- .github/workflows/Release.yaml | 4 ++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7e458c65e3e..0ba2fb75a31 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,31 +1,29 @@ -# PLEASE REMOVE IT AND WRITE TITLE OF YOUR PULL REQUEST +# Description -## Description 📚 - -### Abstract +## Abstract > Please delete this sentence and explain this pull request shortly. -### Background +## Background > Please delete this sentence and explain the circumstances that led to this pull request being sent. -### Details +## Details > Please delete this sentence and describe this pull request. -> For example, it is desirable to describe the specifications of added functions and functions, and detailed explanations of bugs that have been fixed. +> For example, it is desirable to describe the specifications of added functions, and detailed explanations of bugs that have been fixed. -### References +## References > Please describe any standards, algorithms, books, articles, etc. that you referenced when creating the pull request. If there is any novelty, please mention it. -## Destructive Changes 💥 +# Destructive Changes > Please include a description of the changes and a migration guide and send the pull request with a bump major label. (Example : https://github.com/tier4/scenario_simulator_v2/pull/1139) > Otherwise, please remove the "Destructive Changes" section and make sure this pull request is labeled `bump minor` or `bump patch`.) -## Known Limitations 🧨 +# Known Limitations > If there are any limitations on the features or fixes added by this pull request, Please delete this sentence and please clearly describe them. diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index df2fe532e68..51adb4b8e16 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -99,10 +99,10 @@ jobs: run: | echo "${{ github.event.pull_request.body }}" >> release_description.txt echo "" >> release_description.txt - echo "## Pull Request " >> release_description.txt + echo "# Pull Request " >> release_description.txt echo "#${{ github.event.pull_request.number }}" >> release_description.txt echo "" >> release_description.txt - echo "## Related Issues " >> release_description.txt + echo "# Related Issues " >> release_description.txt echo "${{ steps.linked_issues.outputs.issues }}" >> release_description.txt - name: Get release description id: get_release_description From 6661a8a53730c358b405d9bbaadb8f32cf6b1917 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 25 Jan 2024 15:46:35 +0900 Subject: [PATCH 202/245] remove "please" Signed-off-by: Masaya Kataoka --- .github/PULL_REQUEST_TEMPLATE.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0ba2fb75a31..eedf1cc1a69 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,30 +2,30 @@ ## Abstract -> Please delete this sentence and explain this pull request shortly. +> Delete this sentence and explain this pull request shortly. ## Background -> Please delete this sentence and explain the circumstances that led to this pull request being sent. +> Delete this sentence and explain the circumstances that led to this pull request being sent. ## Details -> Please delete this sentence and describe this pull request. +> Delete this sentence and describe this pull request. > For example, it is desirable to describe the specifications of added functions, and detailed explanations of bugs that have been fixed. ## References -> Please describe any standards, algorithms, books, articles, etc. that you referenced when creating the pull request. If there is any novelty, please mention it. +> Describe any standards, algorithms, books, articles, etc. that you referenced when creating the pull request. If there is any novelty, mention it. # Destructive Changes -> Please include a description of the changes and a migration guide and send the pull request with a bump major label. (Example : https://github.com/tier4/scenario_simulator_v2/pull/1139) +> Include a description of the changes and a migration guide and send the pull request with a bump major label. (Example : https://github.com/tier4/scenario_simulator_v2/pull/1139) -> Otherwise, please remove the "Destructive Changes" section and make sure this pull request is labeled `bump minor` or `bump patch`.) +> Otherwise, remove the "Destructive Changes" section and make sure this pull request is labeled `bump minor` or `bump patch`.) # Known Limitations -> If there are any limitations on the features or fixes added by this pull request, Please delete this sentence and please clearly describe them. +> If there are any limitations on the features or fixes added by this pull request, delete this sentence and clearly describe them. > If there are no limitations on the features or modifications added by the pull request, remove the "known limitations" section. From 2cb8135e502564462b4913606e9344e18dd9713a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 25 Jan 2024 15:50:34 +0900 Subject: [PATCH 203/245] add continue-on-error: true Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 51adb4b8e16..4b7159032e1 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -95,6 +95,7 @@ jobs: with: pr_url: ${{github.event.pull_request.html_url}} format: ExternalIssueRef + continue-on-error: true - name: Update release description run: | echo "${{ github.event.pull_request.body }}" >> release_description.txt From cbec87249b2563b9d13fc1ef34ab6ec464782e93 Mon Sep 17 00:00:00 2001 From: Release Bot Date: Thu, 25 Jan 2024 06:55:02 +0000 Subject: [PATCH 204/245] Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 --- 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 +- 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/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/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 +- openscenario/openscenario_visualization/CHANGELOG.rst | 3 +++ openscenario/openscenario_visualization/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 +- 50 files changed, 100 insertions(+), 25 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 19e6d0b8064..215ed5241d6 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -69,6 +69,9 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index fa4138d93d2..c0618641d72 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.8 + 0.8.9 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 3638b762e74..01e802db5f4 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -448,6 +448,9 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index c13ce9b4680..9d99d1b85e1 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.8 + 0.8.9 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 875f29eccb6..b478059a286 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -109,6 +109,9 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 5b2d0f24413..3109f8f4d6e 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.8 + 0.8.9 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 eda912b8c73..c2ed0f5cfc4 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -97,6 +97,9 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 848488c052f..98c18b2f898 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.8 + 0.8.9 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 6effa6b96d1..2bafd2eb0c9 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index f38e80e1649..045d9cf5641 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.8 + 0.8.9 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index 2fe74acc476..13142894a1a 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -442,6 +442,9 @@ Changelog for package concealer * Add the property `allowGoalModification` to switch destination topics * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 50c8a83a0aa..734346d3fcf 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.8 + 0.8.9 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 641ed3be5ca..74a3a07895e 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index c2a4af4979f..937b8f3c275 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.8 + 0.8.9 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 6871fc8045a..ab5411b609d 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -267,6 +267,9 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index c71048d4543..bdf13847927 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.8 + 0.8.9 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 1b601c90d0a..02ca6eae637 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -85,6 +85,9 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 8b1e8213553..5262f295701 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.8 + 0.8.9 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 b114cf8b1e7..7dd9caea2c6 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -468,6 +468,9 @@ Changelog for package openscenario_interpreter * Remove debug prints that were left unintentionally * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 4c607f913b4..4af4c1e019d 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.8 + 0.8.9 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 8afa07fea87..6130d0b9e07 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 69f33107544..34e67ef04e7 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.8 + 0.8.9 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 a3f71dc1379..2bc17bcee7a 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index cab8413ed2a..362d1d339c8 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.8 + 0.8.9 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 457a1eff876..9c97aac9d88 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -90,6 +90,9 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index 40345decbb9..d6c91a13470 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.8 + 0.8.9 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 15be31206ec..b0bdc609cbf 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -78,6 +78,9 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index d3b8360711f..b8336104e79 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.8 + 0.8.9 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 8248207a6dc..6228ae9ec2b 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 5a286e7ab16..62476f83d46 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.8 + 0.8.9 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index 24edf950d1f..299e8ed6433 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index 48ce800c5c9..822959bb983 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.8 + 0.8.9 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 357de96cc6f..4f3457ddfe1 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -204,6 +204,9 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 0b2847b5847..4239df0467f 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.8 + 0.8.9 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 970a95552d6..0c67bf70b09 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -270,6 +270,9 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 644cfb5fe2e..5f693566a92 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.8 + 0.8.9 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 f86d794b6fe..b8f042434cf 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -186,6 +186,9 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 32dc9b22463..fb57503e14a 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.8 + 0.8.9 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 c42de82b6e9..604b74caff5 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -390,6 +390,9 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 196eeea67b0..404faae8b3c 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.8 + 0.8.9 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 47927d030ca..f452c04aff6 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -261,6 +261,9 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 719ae319848..97e69eae086 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.8 + 0.8.9 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 65ede108c7c..27bf7dad09d 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -768,6 +768,9 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index e527f56d0c0..75235b9b3b7 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.8 + 0.8.9 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index dbee7ab9199..1fc0257b1a1 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -84,6 +84,9 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index 319426eab2a..c98ac29a036 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.8 + 0.8.9 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 477e5dc7f41..aecad25de75 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -202,6 +202,9 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index e0a72dac91d..19827c264a3 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.8 + 0.8.9 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 4e25bee53bf..ac232ace9c8 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -415,6 +415,9 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.9 (2024-01-25) +------------------ + 0.8.8 (2024-01-24) ------------------ diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index c548a31c884..4d051d427f6 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.8 + 0.8.9 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From 29c6c26e79735f7094d4092413fb84465e000c6d Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 25 Jan 2024 16:22:19 +0900 Subject: [PATCH 205/245] add example Signed-off-by: Masaya Kataoka --- .github/PULL_REQUEST_TEMPLATE.md | 17 ++++ .../pull_request_samples/example_detail.md | 85 +++++++++++++++++++ .../pull_request_samples/example_simple.md | 5 ++ 3 files changed, 107 insertions(+) create mode 100644 .github/pull_request_samples/example_detail.md create mode 100644 .github/pull_request_samples/example_simple.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index eedf1cc1a69..e864eb0b932 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,30 +1,47 @@ # Description +> Minimal example is [here](pull_request_samples/example_simple.md) + +> Detailed example is [here](pull_request_samples/example_detail.md) + ## Abstract +> [Required] + > Delete this sentence and explain this pull request shortly. ## Background +> [Optional] + > Delete this sentence and explain the circumstances that led to this pull request being sent. + ## Details +> [Optional] + > Delete this sentence and describe this pull request. > For example, it is desirable to describe the specifications of added functions, and detailed explanations of bugs that have been fixed. ## References +> [Optional] + > Describe any standards, algorithms, books, articles, etc. that you referenced when creating the pull request. If there is any novelty, mention it. # Destructive Changes +> [Optional] + > Include a description of the changes and a migration guide and send the pull request with a bump major label. (Example : https://github.com/tier4/scenario_simulator_v2/pull/1139) > Otherwise, remove the "Destructive Changes" section and make sure this pull request is labeled `bump minor` or `bump patch`.) # Known Limitations +> [Optional] + > If there are any limitations on the features or fixes added by this pull request, delete this sentence and clearly describe them. > If there are no limitations on the features or modifications added by the pull request, remove the "known limitations" section. diff --git a/.github/pull_request_samples/example_detail.md b/.github/pull_request_samples/example_detail.md new file mode 100644 index 00000000000..2c7ef75cab5 --- /dev/null +++ b/.github/pull_request_samples/example_detail.md @@ -0,0 +1,85 @@ +# Description + +## Abstract + +Fixed bags velow. + +- Removed equal operators for geometry_msgs::msg::Point and geometry_msgs::msg::Vector3, because they were ambiguous. +- Fixed the bug which caused the intersection functions using vector to look past the last element of the vector and return wrong results. +- Fixed a bug where the LineSegment class could be constructed with a geometry_msgs::msg::Vector3 of size = 0. This lead to initialization of end_point with nan values. +- Fixed the getMinValue and getMaxValue bug where when an empty vector was passed the function tried to de-reference vector.end() and the whole program crashed. +- Fixed a getPolygon bug which caused the function to generate incorrect number of points. +- Added support for negative curvature values which were already supported by HermiteCurve. This incompatibility lead to errors. +- Fixed spline collision implementation error which caused spline to add normalized length to absolute lengths which is incorrect. +- Fixed CatmullRomSubspline collision detection by enabling the HermiteCurve and CatmullRomSpline to have multiple collisions detected and then choosing in the subspline the collisions that occur inside the subspline. + +## Background + +Fixed several residual problems in the geometric calculation library that were causing incorrect scenario execution results. + +## Details + +This PR fixes how the length of the curve is computed + +| Before fix | After fix | +| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Lengths of the first two Curves (A and B) are calculated correctly (because these are full Curve lengths), but the distance in the third Curve (C) is calculated as half of the normalized length of the Curve (0.5). This value is added and the result and distance to the collision in the spline is equal to 20.5 | Lengths of the first two Curves (A and B) are calculated correctly (because these are full Curve lengths) and the distance in the third Curve (C) is also calculated correctly because the collision distance is being denormalized (multiplied by the full length of the Curve) which is equal to 5 (0.5 * 10).This value is added and the result and distance to the collision in the spline is equal to 25 | +| ![RJD-753_base](https://github.com/tier4/scenario_simulator_v2/assets/87643052/18b0f1a5-5370-4cf3-a60a-c1af05448d50) | ![RJD-753_eval](https://github.com/tier4/scenario_simulator_v2/assets/87643052/87570089-bf77-4be8-b950-e3f1fb8499a9) | + +## References + +- [determine-arc-length-of-a-catmull-rom-spline-to-move-at-a-constant-speed](https://gamedev.stackexchange.com/questions/14985/determine-arc-length-of-a-catmull-rom-spline-to-move-at-a-constant-speed) + - This link is an example and is not directly related to this sample. + +# Destructive Changes + +| traffic_simulator/OpenSCENARIO features | Severity | Fix | +|----------------------------------------------------------|-------------|--------------| +| FollowFrontEntityAction | low - distance kept to the front entity might be a bit larger which might influence scenarios which are relying on specific behavior in this action but it does not seem to be a lot of scenarios | Conditions which check this distance should be increased accordingly - trial and error seem to be the best way to find how much change the condition without changing the essence of the scenario| +| Computing the distance to stop_line or other "obstacles" | low - it will increase this distance making it a bit safer but if the scenario conditions rely on this value it might cause issues. No scenario, however, was noticed to be influenced by that to the extent that caused them to fail | Conditions that check this distance should be increased accordingly - trial and error seem to be the best way to find how much change the condition without changing the essence of the scenario | +| Distance-based lane change | Medium - regression is known which was caused by the fix. Cut-in scenarios which are written in a rather strict way might be influenced by this change | Decreasing the distance on which the lane change should occur or change the speed of the vehicles taking part in the scenario - example in the section below | + +This scenario usually passes without the fix but always fails after the fix is added. The scenario is based on [shinjuku_map](https://github.com/tier4/AWSIM/releases/download/v1.2.0/shinjuku_map.zip). + +[scenario.yml.txt](https://github.com/tier4/scenario_simulator_v2/files/13707779/scenario.yml.txt) + +An issue in this scenario is lane change action: + +``` +LaneChangeAction: + LaneChangeActionDynamics: + dynamicsDimension: distance + value: 10 + dynamicsShape: cubic + LaneChangeTarget: + AbsoluteTargetLane: + value: '37' +``` + +To fix it: +- The speed of Ego vehicle can be decreased slightly +- The speed of NPC motorcycle can be increased slightly +- The lane change distance can be decreased slightly + +The exact amount of the change of the values above is hard to estimate because it is very dependent on the specific scenario - like the vehicle position within the lanelet might influence how much the normalized lanelet length was different than not normalized length. + +Here is the scenario that uses the third possible fix - decreasing the distance on which the lane change action takes place. One meter decrease makes the scenario pass again. + +``` +LaneChangeAction: + LaneChangeActionDynamics: + dynamicsDimension: distance + value: 9 + dynamicsShape: cubic + LaneChangeTarget: + AbsoluteTargetLane: + value: '37' +``` + +Full fixed scenario +[scenario.yml.txt](https://github.com/tier4/scenario_simulator_v2/files/13707839/scenario.yml.txt) + +# Known Limitations + +- If the curvature is very large, the calculation may fail. + - This link is an example and is not directly related to this sample. diff --git a/.github/pull_request_samples/example_simple.md b/.github/pull_request_samples/example_simple.md new file mode 100644 index 00000000000..2fc5f7d0f1d --- /dev/null +++ b/.github/pull_request_samples/example_simple.md @@ -0,0 +1,5 @@ +# Description + +## Abstract + +Corrected "Vehicle" incorrectly spelled as "Vehicle". From e0024b99c1d46c37ee919c05323702d61f482643 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 25 Jan 2024 16:29:25 +0900 Subject: [PATCH 206/245] update template Signed-off-by: Masaya Kataoka --- .github/PULL_REQUEST_TEMPLATE.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index e864eb0b932..b134a3e863d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -10,12 +10,16 @@ > Delete this sentence and explain this pull request shortly. +> This section is required, keep it short, clear and to the point. + ## Background > [Optional] > Delete this sentence and explain the circumstances that led to this pull request being sent. +> If there is no background information that needs explanation (e.g., just a typo correction, etc.), then delete this section. + ## Details > [Optional] @@ -24,12 +28,16 @@ > For example, it is desirable to describe the specifications of added functions, and detailed explanations of bugs that have been fixed. +> If there is no code or change that is not immediately obvious without explanation, then this section can be deleted. + ## References > [Optional] > Describe any standards, algorithms, books, articles, etc. that you referenced when creating the pull request. If there is any novelty, mention it. +> If the referenced material does not exist, delete this section. + # Destructive Changes > [Optional] @@ -51,3 +59,5 @@ > If the developer is aware of the existence of such problems or limitations, describe them in detail. > The problems or limitation should be listed as an Issue on Github and a link to it should be provided in this section. + +> If there are no known limitations that you can think of, delete this section. From f3b07716e602dcd030ffd3d74fb3aaac30343919 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 25 Jan 2024 16:32:15 +0900 Subject: [PATCH 207/245] update release note Signed-off-by: Masaya Kataoka --- .github/PULL_REQUEST_TEMPLATE.md | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b134a3e863d..24ea815f844 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,46 +1,36 @@ # Description -> Minimal example is [here](pull_request_samples/example_simple.md) - -> Detailed example is [here](pull_request_samples/example_detail.md) +> Example is here, please check example and comment out this sentense. Minimal example is [here](pull_request_samples/example_simple.md) and etailed example is [here](pull_request_samples/example_detail.md) ## Abstract -> [Required] +> [Required] This section is required, keep it short, clear and to the point. > Delete this sentence and explain this pull request shortly. -> This section is required, keep it short, clear and to the point. - ## Background -> [Optional] +> [Optional] If there is no background information that needs explanation (e.g., just a typo correction, etc.), then delete this section. > Delete this sentence and explain the circumstances that led to this pull request being sent. -> If there is no background information that needs explanation (e.g., just a typo correction, etc.), then delete this section. - ## Details -> [Optional] +> [Optional] If there is no code or change that is not immediately obvious without explanation, then this section can be deleted. > Delete this sentence and describe this pull request. > For example, it is desirable to describe the specifications of added functions, and detailed explanations of bugs that have been fixed. -> If there is no code or change that is not immediately obvious without explanation, then this section can be deleted. - ## References -> [Optional] +> [Optional] If the referenced material does not exist, delete this section. > Describe any standards, algorithms, books, articles, etc. that you referenced when creating the pull request. If there is any novelty, mention it. -> If the referenced material does not exist, delete this section. - # Destructive Changes -> [Optional] +> [Optional] If no destructive change exists, delete this section. > Include a description of the changes and a migration guide and send the pull request with a bump major label. (Example : https://github.com/tier4/scenario_simulator_v2/pull/1139) @@ -48,7 +38,7 @@ # Known Limitations -> [Optional] +> [Optional] If there are no known limitations that you can think of, delete this section. > If there are any limitations on the features or fixes added by this pull request, delete this sentence and clearly describe them. @@ -59,5 +49,3 @@ > If the developer is aware of the existence of such problems or limitations, describe them in detail. > The problems or limitation should be listed as an Issue on Github and a link to it should be provided in this section. - -> If there are no known limitations that you can think of, delete this section. From 320e867080e190b1bd5ff81b28f56e1d42cdb32f Mon Sep 17 00:00:00 2001 From: Release Bot Date: Thu, 25 Jan 2024 07:36:04 +0000 Subject: [PATCH 208/245] Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 --- 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 +- 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/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/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 +- openscenario/openscenario_visualization/CHANGELOG.rst | 3 +++ openscenario/openscenario_visualization/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 +- 50 files changed, 100 insertions(+), 25 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 215ed5241d6..41e52a46a8b 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -69,6 +69,9 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index c0618641d72..c8ac0e479ab 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.9 + 0.8.10 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 01e802db5f4..c1605385ef3 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -448,6 +448,9 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index 9d99d1b85e1..e5dcc707279 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.9 + 0.8.10 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 b478059a286..01e4903a68f 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -109,6 +109,9 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 3109f8f4d6e..3f72d160d33 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.9 + 0.8.10 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 c2ed0f5cfc4..0333f10f0f5 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -97,6 +97,9 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 98c18b2f898..17cc7462869 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.9 + 0.8.10 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 2bafd2eb0c9..e5faf7fcbda 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 045d9cf5641..2ab1b4281cd 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.9 + 0.8.10 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index 13142894a1a..e1ab4977516 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -442,6 +442,9 @@ Changelog for package concealer * Add the property `allowGoalModification` to switch destination topics * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 734346d3fcf..7131d402481 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.9 + 0.8.10 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 74a3a07895e..33ea5840e3f 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 937b8f3c275..cad5e63df71 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.9 + 0.8.10 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 ab5411b609d..504886f152f 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -267,6 +267,9 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index bdf13847927..6e40ba4dcfb 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.9 + 0.8.10 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 02ca6eae637..adbca48849b 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -85,6 +85,9 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 5262f295701..8a4127c73e4 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.9 + 0.8.10 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 7dd9caea2c6..f31bb750658 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -468,6 +468,9 @@ Changelog for package openscenario_interpreter * Remove debug prints that were left unintentionally * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 4af4c1e019d..c386a6ce0da 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.9 + 0.8.10 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 6130d0b9e07..4867f86ba01 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 34e67ef04e7..a84f2421ab7 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.9 + 0.8.10 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 2bc17bcee7a..e7e6ea4ced9 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 362d1d339c8..7e6d1891747 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.9 + 0.8.10 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 9c97aac9d88..952350e5c63 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -90,6 +90,9 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index d6c91a13470..1a3fd44b27c 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.9 + 0.8.10 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 b0bdc609cbf..6062301946d 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -78,6 +78,9 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index b8336104e79..abb7562c22f 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.9 + 0.8.10 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 6228ae9ec2b..5bbffe7c01a 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 62476f83d46..bf1fb67b312 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.9 + 0.8.10 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index 299e8ed6433..71ff104197e 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index 822959bb983..82c07b70493 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.9 + 0.8.10 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 4f3457ddfe1..7e689875480 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -204,6 +204,9 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 4239df0467f..fb6a07748f7 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.9 + 0.8.10 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 0c67bf70b09..d25f8d8118e 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -270,6 +270,9 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 5f693566a92..8bd7d6ffbf1 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.9 + 0.8.10 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 b8f042434cf..e980cb8434b 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -186,6 +186,9 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index fb57503e14a..149df6a019f 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.9 + 0.8.10 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 604b74caff5..0ced8790358 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -390,6 +390,9 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 404faae8b3c..9b51e28038c 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.9 + 0.8.10 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index f452c04aff6..1722142e252 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -261,6 +261,9 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 97e69eae086..01388d0a3a6 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.9 + 0.8.10 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 27bf7dad09d..5d9b5f28247 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -768,6 +768,9 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index 75235b9b3b7..74977a695a7 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.9 + 0.8.10 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 1fc0257b1a1..136b6eeae0e 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -84,6 +84,9 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index c98ac29a036..31c7d3873a6 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.9 + 0.8.10 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 aecad25de75..72cf783c4ac 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -202,6 +202,9 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 19827c264a3..0d9c3dcec4d 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.9 + 0.8.10 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 ac232ace9c8..051523f1087 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -415,6 +415,9 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.10 (2024-01-25) +------------------- + 0.8.9 (2024-01-25) ------------------ diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 4d051d427f6..2be62af028a 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.9 + 0.8.10 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From c856590eb69dff35c24d61f1881d81d6ed073699 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 25 Jan 2024 18:06:20 +0900 Subject: [PATCH 209/245] add auto generate release note Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 4b7159032e1..8643ecbb70d 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -117,6 +117,7 @@ jobs: tag: ${{ steps.new_version.outputs.new_version }} name: ${{ steps.new_version.outputs.new_version }} body: ${{ steps.get_release_description.outputs.stdout }} + generateReleaseNotes: true - name: Delete branch if: github.event.pull_request.merged == true uses: SvanBoxel/delete-merged-branch@main From 05c769ff0172483156afc36e17bee7ab90e88818 Mon Sep 17 00:00:00 2001 From: Release Bot Date: Thu, 25 Jan 2024 09:10:13 +0000 Subject: [PATCH 210/245] Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 --- 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 +- 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/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/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 +- openscenario/openscenario_visualization/CHANGELOG.rst | 3 +++ openscenario/openscenario_visualization/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 +- 50 files changed, 100 insertions(+), 25 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 41e52a46a8b..ab02f798d42 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -69,6 +69,9 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index c8ac0e479ab..5f19a4446c5 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.10 + 0.8.11 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 c1605385ef3..d9d716562d0 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -448,6 +448,9 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index e5dcc707279..8883dbcfcdc 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.10 + 0.8.11 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 01e4903a68f..4f1fabcf222 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -109,6 +109,9 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 3f72d160d33..5e624d0ab5b 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.10 + 0.8.11 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 0333f10f0f5..db9178515f1 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -97,6 +97,9 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 17cc7462869..5a37f24a0b7 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.10 + 0.8.11 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 e5faf7fcbda..1f7a62c06f8 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 2ab1b4281cd..7d4e5de968a 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.10 + 0.8.11 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index e1ab4977516..f638655a78a 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -442,6 +442,9 @@ Changelog for package concealer * Add the property `allowGoalModification` to switch destination topics * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 7131d402481..d751d0e80ba 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.10 + 0.8.11 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 33ea5840e3f..5bfec6b0952 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index cad5e63df71..6ad92168bed 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.10 + 0.8.11 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 504886f152f..f7b3a690455 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -267,6 +267,9 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index 6e40ba4dcfb..60267fa2a99 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.10 + 0.8.11 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 adbca48849b..d5e0409f0a3 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -85,6 +85,9 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 8a4127c73e4..87f16b61536 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.10 + 0.8.11 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 f31bb750658..4a8e1fa1d50 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -468,6 +468,9 @@ Changelog for package openscenario_interpreter * Remove debug prints that were left unintentionally * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index c386a6ce0da..fd77e7d0504 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.10 + 0.8.11 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 4867f86ba01..e4fe34fee3d 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index a84f2421ab7..9eec407c4f0 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.10 + 0.8.11 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 e7e6ea4ced9..0c7850fc3a1 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 7e6d1891747..61c48bf17e7 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.10 + 0.8.11 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 952350e5c63..30c2e40f6cf 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -90,6 +90,9 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index 1a3fd44b27c..04377bb4f81 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.10 + 0.8.11 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 6062301946d..5e187f17621 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -78,6 +78,9 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index abb7562c22f..745fcb11561 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.10 + 0.8.11 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 5bbffe7c01a..e4d729a223b 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index bf1fb67b312..b61e53c8509 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.10 + 0.8.11 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index 71ff104197e..bd58125b3a3 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index 82c07b70493..cd875503436 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.10 + 0.8.11 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 7e689875480..3a1c7f3c626 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -204,6 +204,9 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index fb6a07748f7..e2911287f6b 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.10 + 0.8.11 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 d25f8d8118e..6ffc680b22b 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -270,6 +270,9 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 8bd7d6ffbf1..8b5dae16e01 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.10 + 0.8.11 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 e980cb8434b..1b75c3050fa 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -186,6 +186,9 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 149df6a019f..ab41d034cee 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.10 + 0.8.11 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 0ced8790358..2e49dc86452 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -390,6 +390,9 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 9b51e28038c..343442d03a9 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.10 + 0.8.11 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 1722142e252..a8e0555baa1 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -261,6 +261,9 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 01388d0a3a6..9095980f486 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.10 + 0.8.11 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 5d9b5f28247..b014dfa4191 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -768,6 +768,9 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index 74977a695a7..b8204d29d91 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.10 + 0.8.11 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 136b6eeae0e..90c3fdddb74 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -84,6 +84,9 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index 31c7d3873a6..0b5833b73ab 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.10 + 0.8.11 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 72cf783c4ac..acfce0c32e0 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -202,6 +202,9 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 0d9c3dcec4d..da425d352aa 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.10 + 0.8.11 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 051523f1087..65ef54e2d9a 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -415,6 +415,9 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.11 (2024-01-25) +------------------- + 0.8.10 (2024-01-25) ------------------- diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 2be62af028a..d1a4ef29552 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.10 + 0.8.11 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From 1f29cacc23f9442ce81ea12fb727ad009d0315fe Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 25 Jan 2024 18:14:48 +0900 Subject: [PATCH 211/245] remove related pull request field Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index 8643ecbb70d..d7884d4d197 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -91,7 +91,7 @@ jobs: force: true - name: Get linked issues id: linked_issues - uses: hossainemruz/linked-issues@main + uses: hossainemruz/linked-issues@v0.1.0 with: pr_url: ${{github.event.pull_request.html_url}} format: ExternalIssueRef @@ -100,9 +100,6 @@ jobs: run: | echo "${{ github.event.pull_request.body }}" >> release_description.txt echo "" >> release_description.txt - echo "# Pull Request " >> release_description.txt - echo "#${{ github.event.pull_request.number }}" >> release_description.txt - echo "" >> release_description.txt echo "# Related Issues " >> release_description.txt echo "${{ steps.linked_issues.outputs.issues }}" >> release_description.txt - name: Get release description @@ -120,6 +117,6 @@ jobs: generateReleaseNotes: true - name: Delete branch if: github.event.pull_request.merged == true - uses: SvanBoxel/delete-merged-branch@main + uses: SvanBoxel/delete-merged-branch@1.4.3 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From ceb0bc1e29653dd753bfcfc7f9049a21ff962872 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 25 Jan 2024 18:17:49 +0900 Subject: [PATCH 212/245] add issue section Signed-off-by: Masaya Kataoka --- .github/workflows/Release.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml index d7884d4d197..a2722c829b1 100644 --- a/.github/workflows/Release.yaml +++ b/.github/workflows/Release.yaml @@ -100,6 +100,9 @@ jobs: run: | echo "${{ github.event.pull_request.body }}" >> release_description.txt echo "" >> release_description.txt + - name: Update related issues + if: ${{ steps.links.outputs.issues }} != "" + run: | echo "# Related Issues " >> release_description.txt echo "${{ steps.linked_issues.outputs.issues }}" >> release_description.txt - name: Get release description From b79f89df15ee51f291a6ffe3488ad1fc9398c241 Mon Sep 17 00:00:00 2001 From: Release Bot Date: Thu, 25 Jan 2024 09:24:02 +0000 Subject: [PATCH 213/245] Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 --- 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 +- 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/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/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 +- openscenario/openscenario_visualization/CHANGELOG.rst | 3 +++ openscenario/openscenario_visualization/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 +- 50 files changed, 100 insertions(+), 25 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index ab02f798d42..8d44cc0d5e6 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -69,6 +69,9 @@ Changelog for package arithmetic * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index 5f19a4446c5..cac5f02abea 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 0.8.11 + 0.8.12 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 d9d716562d0..02518150e73 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -448,6 +448,9 @@ Changelog for package geometry * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Shota Minami, Tatsuya Yamasaki, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index 8883dbcfcdc..59896846e9a 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 0.8.11 + 0.8.12 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 4f1fabcf222..4f65dcdfab2 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -109,6 +109,9 @@ Changelog for package scenario_simulator_exception * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 5e624d0ab5b..a322119ce0f 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 0.8.11 + 0.8.12 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 db9178515f1..09bb9004ec9 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -97,6 +97,9 @@ Changelog for package junit_exporter * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 5a37f24a0b7..48bd1b13f8b 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 0.8.11 + 0.8.12 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 1f7a62c06f8..2e82679142b 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package status_monitor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 7d4e5de968a..8a033e36a42 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 0.8.11 + 0.8.12 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index f638655a78a..8fcbbdfa2d5 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -442,6 +442,9 @@ Changelog for package concealer * Add the property `allowGoalModification` to switch destination topics * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/external/concealer/package.xml b/external/concealer/package.xml index d751d0e80ba..dad1f5dda2a 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 0.8.11 + 0.8.12 Provides a class 'Autoware' to conceal miscellaneous things to simplify Autoware management of the simulator. Tatsuya Yamasaki Apache License 2.0 diff --git a/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index 5bfec6b0952..f49881000cd 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package kashiwanoha_map * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index 6ad92168bed..6e0e2e9fff3 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 0.8.11 + 0.8.12 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 f7b3a690455..edee9e5f207 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -267,6 +267,9 @@ Changelog for package cpp_mock_scenarios * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index 60267fa2a99..fc5be6b95bd 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 0.8.11 + 0.8.12 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 d5e0409f0a3..2c9d44d9c17 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -85,6 +85,9 @@ Changelog for package openscenario_experimental_catalog * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index 87f16b61536..527ac6812a5 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 0.8.11 + 0.8.12 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 4a8e1fa1d50..ff80c2bf957 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -468,6 +468,9 @@ Changelog for package openscenario_interpreter * Remove debug prints that were left unintentionally * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index fd77e7d0504..6e31aa1cdbd 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 0.8.11 + 0.8.12 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 e4fe34fee3d..85f2a3db587 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_example * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 9eec407c4f0..06a2be54002 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 0.8.11 + 0.8.12 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 0c7850fc3a1..d321ab0c656 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_interpreter_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 61c48bf17e7..48d3da08f42 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 0.8.11 + 0.8.12 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 30c2e40f6cf..b8782afb315 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -90,6 +90,9 @@ Changelog for package openscenario_preprocessor * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index 04377bb4f81..1f9ecc752bc 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 0.8.11 + 0.8.12 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 5e187f17621..6e365df8a9d 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -78,6 +78,9 @@ Changelog for package openscenario_preprocessor_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 745fcb11561..db3e38333a1 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 0.8.11 + 0.8.12 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 e4d729a223b..384181f0194 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_utility * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index b61e53c8509..5a0e0681734 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 0.8.11 + 0.8.12 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index bd58125b3a3..ef074d1d7aa 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -66,6 +66,9 @@ Changelog for package openscenario_visualization * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index cd875503436..0384afed407 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 0.8.11 + 0.8.12 Visualization tools for simulation results Masaya Kataoka Apache License 2.0 diff --git a/scenario_simulator_v2/CHANGELOG.rst b/scenario_simulator_v2/CHANGELOG.rst index 3a1c7f3c626..88726a7b23c 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -204,6 +204,9 @@ Changelog for package scenario_simulator_v2 * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index e2911287f6b..5786ec11a82 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 0.8.11 + 0.8.12 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 6ffc680b22b..2b47a9d16d4 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -270,6 +270,9 @@ Changelog for package behavior_tree_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 8b5dae16e01..3ea31032ad3 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 0.8.11 + 0.8.12 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 1b75c3050fa..d5e7ff75a09 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -186,6 +186,9 @@ Changelog for package do_nothing_plugin * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index ab41d034cee..806a49a778d 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 0.8.11 + 0.8.12 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 2e49dc86452..b11764bc466 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -390,6 +390,9 @@ Changelog for package simple_sensor_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 343442d03a9..8f4ac43a652 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 0.8.11 + 0.8.12 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index a8e0555baa1..128307c4c0c 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -261,6 +261,9 @@ Changelog for package simulation_interface * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 9095980f486..07fe8eb5746 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 0.8.11 + 0.8.12 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 b014dfa4191..3ab94b7fc56 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -768,6 +768,9 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index b8204d29d91..aa1bdbcf88e 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 0.8.11 + 0.8.12 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 90c3fdddb74..183ac680eb3 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -84,6 +84,9 @@ Changelog for package openscenario_msgs * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Piotr Zyskowski, Release Bot, f0reachARR, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index 0b5833b73ab..958976bda73 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 0.8.11 + 0.8.12 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 acfce0c32e0..a3fa3dd54be 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -202,6 +202,9 @@ Changelog for package random_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index da425d352aa..cb6944d88b1 100644 --- a/test_runner/random_test_runner/package.xml +++ b/test_runner/random_test_runner/package.xml @@ -2,7 +2,7 @@ random_test_runner - 0.8.11 + 0.8.12 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 65ef54e2d9a..4e18d35212a 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -415,6 +415,9 @@ Changelog for package scenario_test_runner * Merge remote-tracking branch 'origin/master' into feature/allow-goal-modification * Contributors: Dawid Moszyński, Kotaro Yoshimoto, Lukasz Chojnacki, Masaya Kataoka, Michał Kiełczykowski, Paweł Lech, Piotr Zyskowski, Release Bot, Tatsuya Yamasaki, f0reachARR, yamacir-kit +0.8.12 (2024-01-25) +------------------- + 0.8.11 (2024-01-25) ------------------- diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index d1a4ef29552..4fae0a0ee4c 100644 --- a/test_runner/scenario_test_runner/package.xml +++ b/test_runner/scenario_test_runner/package.xml @@ -2,7 +2,7 @@ scenario_test_runner - 0.8.11 + 0.8.12 scenario test runner package Tatsuya Yamasaki Apache License 2.0 From 901a792ce15435420f4c3a533577e2cb950db41a Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 14 Feb 2024 16:00:21 +0900 Subject: [PATCH 214/245] add docs Signed-off-by: Masaya Kataoka --- docs/developer_guide/LanePoseCalculation.md | 39 +++++++++++++++++++++ mkdocs.yml | 5 +-- 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 docs/developer_guide/LanePoseCalculation.md diff --git a/docs/developer_guide/LanePoseCalculation.md b/docs/developer_guide/LanePoseCalculation.md new file mode 100644 index 00000000000..7f8daa3049a --- /dev/null +++ b/docs/developer_guide/LanePoseCalculation.md @@ -0,0 +1,39 @@ +# Lane pose caluculation + +The calculation method of the lane coordinate system differs from Entity to Entity, and the process of determining which lane to match is complex, including fallback. +In this document, we will show how the posture calculation of the lane coordinate system is performed for each Entity. + +There are two possible times when the lane coordinate system may be computed for all Entities. +These are the timing immediately after the spawn of the Entity and the timing of the frame update. + +## Lane pose caluculation when spawning + +If you spawn by specifying the lane coordinate system, lane pose calucluation is skipped. +Internally, spawn by specifying the lane coordinate system means specifying LaneltPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html) +In the OpenSCENARIO , it is to execute a TeleportAction by specifying the LanePosition. ([e.g](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/test_runner/scenario_test_runner/)) + +If you spawn by specifying the map coordinate system, [lane pose calucluation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is executed. + +There are several internal implementations of pose calculation in the lane coordinate system implemented in the [HDmapUtils class](https://tier4.github.io/scenario_simulator_v2-api-docs/classhdmap__utils_1_1HdMapUtils.html), +but the one used in this case is [here](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L544-L554). + +## Lane pose caluculation when updating frame. + +### Ego Entity + +### Non-Ego Entity + +For non-EgoEntity, the process diverges depending on whether planning is done in the lane coordinate system inside BehaviorPlugin. +If planning is done in the lane coordinate system, there is no need to convert from the map coordinate system to the lane coordinate system after onUpdate is executed. + +#### VehicleEntity (with Behavior-Tree) + +#### Vehicle Entity (with Do-Nothing) + +While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated at spawn and is not recalculated thereafter. + +#### Pedestrian Entity (with Behavior-Tree) + +#### Pedestrian Entity (with Do-Nothing) + +While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated at spawn and is not recalculated thereafter. diff --git a/mkdocs.yml b/mkdocs.yml index c1be9de4a50..27deafc1bd7 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -75,7 +75,7 @@ nav: - developer_guide/AutowareAPI.md - developer_guide/NPCBehavior.md - developer_guide/BehaviorPlugin.md - # - developer_guide/ErrorCategories.md + # - developer_guide/ErrorCategories.md - developer_guide/OpenSCENARIOSupport.md - developer_guide/SimpleSensorSimulator.md - developer_guide/SystemArchitecture.md @@ -83,7 +83,8 @@ nav: - developer_guide/ZeroMQ.md - developer_guide/VehicleDynamics.md - developer_guide/SimulationResultFormat.md -# cspell: ignore TIERIV + - developer_guide/LanePoseCalculation.md + # cspell: ignore TIERIV - developer_guide/TIERIVScenarioFormatVersion2.md - developer_guide/CONTRIBUTING.md - developer_guide/Communication.md From 02ec0eecefbc3167184315e0b044cc0bb1dff3ec Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 15:01:20 +0900 Subject: [PATCH 215/245] remove conflict Signed-off-by: Masaya Kataoka --- .github/ISSUE_TEMPLATE/bug_report.md | 5 ----- .github/pull_request_samples/example_detail.md | 4 ---- 2 files changed, 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 5c20eec5b37..83c3d2d4ffd 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -24,11 +24,6 @@ A clear and concise description of what you expected to happen. If applicable, add screenshots to help explain your problem. **Desktop (please complete the following information):** -<<<<<<< HEAD - - OS: [e.g. ubuntu 22.04] - - Version [e.g. 22] -======= - Ubuntu Version [e.g. 22.04] ->>>>>>> origin/master - ROS 2 version - DDS diff --git a/.github/pull_request_samples/example_detail.md b/.github/pull_request_samples/example_detail.md index dab86bdb2ae..c31fe9672cd 100644 --- a/.github/pull_request_samples/example_detail.md +++ b/.github/pull_request_samples/example_detail.md @@ -2,11 +2,7 @@ ## Abstract -<<<<<<< HEAD -Fixed bags velow. -======= Fixed bags below. ->>>>>>> origin/master - Removed equal operators for geometry_msgs::msg::Point and geometry_msgs::msg::Vector3, because they were ambiguous. - Fixed the bug which caused the intersection functions using vector to look past the last element of the vector and return wrong results. From d913c31fca912cf159ffa228425cc551b020080b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 15:20:46 +0900 Subject: [PATCH 216/245] update docs Signed-off-by: Masaya Kataoka --- docs/developer_guide/LanePoseCalculation.md | 32 +++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/docs/developer_guide/LanePoseCalculation.md b/docs/developer_guide/LanePoseCalculation.md index 7f8daa3049a..d1fa2c6fde7 100644 --- a/docs/developer_guide/LanePoseCalculation.md +++ b/docs/developer_guide/LanePoseCalculation.md @@ -15,7 +15,35 @@ In the OpenSCENARIO , it is to execute a TeleportAction by specifying the LanePo If you spawn by specifying the map coordinate system, [lane pose calucluation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is executed. There are several internal implementations of pose calculation in the lane coordinate system implemented in the [HDmapUtils class](https://tier4.github.io/scenario_simulator_v2-api-docs/classhdmap__utils_1_1HdMapUtils.html), -but the one used in this case is [here](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L544-L554). +but the one used in this case is [here](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L602-L630). + +In this function, the following procedure is used to calculate the pose in the lane coordinate system. + +### search for matching lanes + +This procedure falls back to 2 if 1. fails. +If 2 also fails, fallback is performed to 3. +If 3 also fails, fallback is performed to 4. + +1. [Obtain a candidate lane for matching considering the bounding box.](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L607) +1. [Obtain lanes in the neighborhood of the Entity as matching candidates without considering the bounding box.](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L608-L610) +1. [Obtain matching candidates before and after the lane matched by considering the bounding box.](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L611-L628) +1. [Obtain matching candidates that exist in close proximity (0.1m) to the Entity.](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L629C10-L629C23) + +If all cases from 1~4 fail, the pose in the lane coordinate system will be a calculation failure. + +### Calculate pose in lane coordinate system + +After narrowing down the candidate lanes by the above procedure, the pose of the lane coordinate system is calculated from the coordinates of the intersection of the horizontal bar extended from the Entity and the Catmull-Rom Spline curve constructed from the center line of the lane for each candidate lane. + +![Lane pose calculation](../image/lane_pose_calculation.png "Lane pose calculation.") + +The length of the horizontal bar is defined by the type of the entity. + +#### Ego Entity +Let $L_m$ be the length of the abscissa used in the lane coordinate system calculation and the tread of the front wheels be $t_f$ and the tread of the rear wheels be $t_r$. + +$$L_m = max(t_r, t_f) * 0.5 + 1.0$$ ## Lane pose caluculation when updating frame. @@ -36,4 +64,4 @@ While the do-nothing behavior plugin is running, Entity does not move, so the la #### Pedestrian Entity (with Do-Nothing) -While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated at spawn and is not recalculated thereafter. +While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated at spawn and is not recalculated thereafter. \ No newline at end of file From ea9b839c048ea77e522c8de0a29c7253cc706972 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Thu, 15 Feb 2024 18:55:21 +0900 Subject: [PATCH 217/245] add docs Signed-off-by: Masaya Kataoka --- .../LanePoseCalculation.md | 61 ++++++++++++++++++ .../Spawn.md} | 46 ++----------- .../lane_pose_calculation/UpdateFrame.md | 44 +++++++++++++ docs/image/lane_pose_calculation.png | Bin 0 -> 280829 bytes mkdocs.yml | 5 +- 5 files changed, 115 insertions(+), 41 deletions(-) create mode 100644 docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md rename docs/developer_guide/{LanePoseCalculation.md => lane_pose_calculation/Spawn.md} (56%) create mode 100644 docs/developer_guide/lane_pose_calculation/UpdateFrame.md create mode 100644 docs/image/lane_pose_calculation.png diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md new file mode 100644 index 00000000000..69c79201a74 --- /dev/null +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -0,0 +1,61 @@ +# Lane pose caluculation + +The calculation method of the lane coordinate system differs from Entity to Entity, and the process of determining which lane to match is complex, including fallback. +In this document, we will show how the posture calculation of the lane coordinate system is performed for each Entity. + +There are two possible times when the lane coordinate system may be computed for all Entities. +These are the [timing immediately after the spawn of the Entity](Spawn.md) and the [timing of the frame update](UpdateFrame.md). + +After the lanes to be matched have been determined, the calculation of the specific lane coordinate system to be performed is always based on a per spline curve and line segment determination. + +![Lane pose calculation](../../image/lane_pose_calculation.png "Lane pose calculation.") + +The centerline of a lane is expressed by the cubic equation [Catmull-Rom spline.](https://en.wikipedia.org/wiki/Centripetal_Catmull%E2%80%93Rom_spline) +Catmull-Rom spline and line perturbation are implemented by finding the multiple solution of one cubic equation. +A specific implementation can be found [here](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/common/math/geometry/src/solver/polynomial_solver.cpp#L98-L131) and [here.](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/common/math/geometry/src/spline/hermite_curve.cpp#L124-L187) + +Let $a_i,b_i,c_i,d_i (i = x, y, z & s = [0,1])$ is a coefficient of the spline. +Then, the spline is a described like below. + +$$x(s) = a_xs^3 + b_xs^2 + c_xs + d_x $$ + +$$y(s) = a_ys^3 + b_ys^2 + c_ys + d_y $$ + +$$z(s) = a_zs^3 + b_ys^2 + c_zs + d_z $$ + +When a hit decision with a line segment is performed, only $x(s),y(s)$ of the above equations are considered, since they are performed in two dimensions. + +The equation of the line segment is expressed as. +Let $e_i,f_i (i = x, y, z & u = [0,1])$ is a coefficient of the line segment. + +$$x(u) = e_xu + f_x $$ + +$$y(u) = e_yu + f_y $$ + +$$z(u) = e_zu + f_z $$ + +When a hit decision with a spline is performed, only $x(u),y(u)$ of the above equations are considered, since they are performed in two dimensions. + +To determine the pertinence of a line segment and a spline, find the values of s and u that satisfy the following equations. + +$$x(s) = x(u) = a_xs^3 + b_xs^2 + c_xs + d_x = e_xu + f_x$$ + +$$y(s) = y(u) = a_ys^3 + b_ys^2 + c_ys + d_y = e_yu + f_y$$ + +If $e_x\neq0$ +Perform the equation transformation and eliminate the variable $u$. + +$$x(u)\frac{e_f}{e_x} = (e_xu + f_x)\frac{e_f}{e_x} = e_fu +\frac{f_xe_f}{e_x} = x(s)\frac{e_f}{e_x} = (a_xs^3 + b_xs^2 + c_xs + d_x)\frac{e_f}{e_x}$$ + +$$y(s) - x(u)\frac{e_f}{e_x} = a_ys^3 + b_ys^2 + c_ys + d_y - (a_xs^3 + b_xs^2 + c_xs + d_x)\frac{e_f}{e_x} = e_yu + f_y - (e_xu + f_x)\frac{e_f}{e_x} = f_y - \frac{f_xe_f}{e_x}$$ + +Therefore, we can perform a hit decision between the Spline curve and the line segment by finding a rational solution of the following cubic equation. + +$$(a_y - a_x\frac{e_f}{e_x})s^3 + (b_y - b_x\frac{e_f}{e_x})s^2 + (c_y - c_x\frac{e_f}{e_x})s + d_y - d_x\frac{e_f}{e_x} - f_y + \frac{f_xe_f}{e_x} = 0$$ + +After getting rational solution $s$, calculate $u$ from the linear function. +If the $s$ and $u$ is in $[0,1]$, Catmull-Rom spline and the line segment are determined to be in conflict. + +The value of $S$ obtained in this case is the coordinate $S$ in the lane coordinate system. +Next, the value of $s$ is substituted into the Catmull-Rom spline equation, and the tangent direction at that point is calculated. +The Euler angle is calculated from the difference in orientation between the obtained tangent direction and Entity. diff --git a/docs/developer_guide/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/Spawn.md similarity index 56% rename from docs/developer_guide/LanePoseCalculation.md rename to docs/developer_guide/lane_pose_calculation/Spawn.md index d1fa2c6fde7..7ba10fd4e9c 100644 --- a/docs/developer_guide/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -1,12 +1,4 @@ -# Lane pose caluculation - -The calculation method of the lane coordinate system differs from Entity to Entity, and the process of determining which lane to match is complex, including fallback. -In this document, we will show how the posture calculation of the lane coordinate system is performed for each Entity. - -There are two possible times when the lane coordinate system may be computed for all Entities. -These are the timing immediately after the spawn of the Entity and the timing of the frame update. - -## Lane pose caluculation when spawning +# Lane pose caluculation when spawning If you spawn by specifying the lane coordinate system, lane pose calucluation is skipped. Internally, spawn by specifying the lane coordinate system means specifying LaneltPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html) @@ -19,49 +11,23 @@ but the one used in this case is [here](https://github.com/tier4/scenario_simula In this function, the following procedure is used to calculate the pose in the lane coordinate system. -### search for matching lanes +## Search for matching lanes This procedure falls back to 2 if 1. fails. If 2 also fails, fallback is performed to 3. If 3 also fails, fallback is performed to 4. -1. [Obtain a candidate lane for matching considering the bounding box.](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L607) +1. [Obtain candidate lanes for matching considering the bounding box.](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L607) 1. [Obtain lanes in the neighborhood of the Entity as matching candidates without considering the bounding box.](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L608-L610) 1. [Obtain matching candidates before and after the lane matched by considering the bounding box.](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L611-L628) 1. [Obtain matching candidates that exist in close proximity (0.1m) to the Entity.](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L629C10-L629C23) If all cases from 1~4 fail, the pose in the lane coordinate system will be a calculation failure. -### Calculate pose in lane coordinate system +## Calculate pose in lane coordinate system After narrowing down the candidate lanes by the above procedure, the pose of the lane coordinate system is calculated from the coordinates of the intersection of the horizontal bar extended from the Entity and the Catmull-Rom Spline curve constructed from the center line of the lane for each candidate lane. -![Lane pose calculation](../image/lane_pose_calculation.png "Lane pose calculation.") - -The length of the horizontal bar is defined by the type of the entity. - -#### Ego Entity -Let $L_m$ be the length of the abscissa used in the lane coordinate system calculation and the tread of the front wheels be $t_f$ and the tread of the rear wheels be $t_r$. - -$$L_m = max(t_r, t_f) * 0.5 + 1.0$$ - -## Lane pose caluculation when updating frame. - -### Ego Entity - -### Non-Ego Entity - -For non-EgoEntity, the process diverges depending on whether planning is done in the lane coordinate system inside BehaviorPlugin. -If planning is done in the lane coordinate system, there is no need to convert from the map coordinate system to the lane coordinate system after onUpdate is executed. - -#### VehicleEntity (with Behavior-Tree) - -#### Vehicle Entity (with Do-Nothing) - -While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated at spawn and is not recalculated thereafter. - -#### Pedestrian Entity (with Behavior-Tree) - -#### Pedestrian Entity (with Do-Nothing) +![Lane pose calculation](../../image/lane_pose_calculation.png "Lane pose calculation.") -While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated at spawn and is not recalculated thereafter. \ No newline at end of file +In this case, the length of the horizontal bar is `2.0`m. diff --git a/docs/developer_guide/lane_pose_calculation/UpdateFrame.md b/docs/developer_guide/lane_pose_calculation/UpdateFrame.md new file mode 100644 index 00000000000..401d777b107 --- /dev/null +++ b/docs/developer_guide/lane_pose_calculation/UpdateFrame.md @@ -0,0 +1,44 @@ +# Lane pose caluculation when updating frames + +If the entity's behavioral logic is planned in the lane coordinate system, skip this process. + +## Ego Entity + +Since EgoEntity is controlled by Autoware rather than the behavior plugin, this process is performed for every frame update. +This process is implemented [here](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/api/api.cpp#L240C9-L240C19) and [here](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/entity/ego_entity.cpp#L276-L312). + +### Search for matching lanes + +This process branches off into 2 or 3 depending on the outcome of 1. +If 3 is executed and fails, fallbacks to 4. + +1. [Obtain a candidate lane for matching from Autoware planner output.](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/entity/ego_entity.cpp#L276) +2. [If Autoware has no planner output, try obtaining candidate lanes for matching considering the bounding box.](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/entity/ego_entity.cpp#L286-L287) +3. [If Autoware has planner output, try matching considering the Autoware planner output.](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/entity/ego_entity.cpp#L289-L290) +4. [If the step 3 failed, try obtaining candidate lanes for matching considering the bounding box.](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/entity/ego_entity.cpp#L292-L293) + +### Calculate pose in lane coordinate system + +Let $L_m$ be the length of the horizontal bar used in the lane coordinate system calculation and the tread of the front wheels be $t_f$ and the tread of the rear wheels be $t_r$. +See also [here.](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/entity/ego_entity.cpp#L278-L284) + +$$L_m = max(t_r, t_f) + 2.0$$ + +![Lane pose calculation](../../image/lane_pose_calculation.png "Lane pose calculation.") + +## Non-Ego Entity + +For non-EgoEntity, the process diverges depending on whether planning is done in the lane coordinate system inside BehaviorPlugin. +If planning is done in the lane coordinate system, there is no need to convert from the map coordinate system to the lane coordinate system after onUpdate is executed. + +### VehicleEntity (with Behavior-Tree) + +### Vehicle Entity (with Do-Nothing) + +While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated at spawn and is not recalculated thereafter. + +### Pedestrian Entity (with Behavior-Tree) + +### Pedestrian Entity (with Do-Nothing) + +While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated at spawn and is not recalculated thereafter. diff --git a/docs/image/lane_pose_calculation.png b/docs/image/lane_pose_calculation.png new file mode 100644 index 0000000000000000000000000000000000000000..4bc031323d6a55f07ec647e2b4d82694895ccaba GIT binary patch literal 280829 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

g-=xd9WRJaXKf5C$GR;9*7kxFiT>$30K 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 literal 0 HcmV?d00001 diff --git a/mkdocs.yml b/mkdocs.yml index 31744a3b3c1..6b54533e23e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -88,7 +88,10 @@ nav: - developer_guide/ZeroMQ.md - developer_guide/VehicleDynamics.md - developer_guide/SimulationResultFormat.md - - developer_guide/LanePoseCalculation.md + - Lane Pose Calculation: + Timing of lane pose calculation: developer_guide/lane_pose_calculation/LanePoseCalculation.md + Process of lane pose calculation when spawning entity: developer_guide/lane_pose_calculation/Spawn.md + Process of lane pose calculation when updating frame: developer_guide/lane_pose_calculation/UpdateFrame.md # cspell: ignore TIERIV - developer_guide/TIERIVScenarioFormatVersion2.md - developer_guide/CONTRIBUTING.md From 128666dce7fd229d6c0b810a149e810fb8ecf3f7 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 14:38:04 +0900 Subject: [PATCH 218/245] update document Signed-off-by: Masaya Kataoka --- .../lane_pose_calculation/LanePoseCalculation.md | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md index 69c79201a74..d4737bac58a 100644 --- a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -6,6 +6,11 @@ In this document, we will show how the posture calculation of the lane coordinat There are two possible times when the lane coordinate system may be computed for all Entities. These are the [timing immediately after the spawn of the Entity](Spawn.md) and the [timing of the frame update](UpdateFrame.md). +!!! Note + If you are not a simulator developer but a scenario writer, it is sufficient to check [this document](UpdateFrame.md) and [this section](#lane-coordinate-system-calculation-algorithm-for-a-specific-lane), since the distance measurement via condition in used in the OpenSCENARIO is basically done after frame update. + +## Lane coordinate system calculation algorithm for a specific lane + After the lanes to be matched have been determined, the calculation of the specific lane coordinate system to be performed is always based on a per spline curve and line segment determination. ![Lane pose calculation](../../image/lane_pose_calculation.png "Lane pose calculation.") @@ -14,7 +19,7 @@ The centerline of a lane is expressed by the cubic equation [Catmull-Rom spline. Catmull-Rom spline and line perturbation are implemented by finding the multiple solution of one cubic equation. A specific implementation can be found [here](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/common/math/geometry/src/solver/polynomial_solver.cpp#L98-L131) and [here.](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/common/math/geometry/src/spline/hermite_curve.cpp#L124-L187) -Let $a_i,b_i,c_i,d_i (i = x, y, z & s = [0,1])$ is a coefficient of the spline. +Let $a_i,b_i,c_i,d_i (i = x, y, z)$ $s = [0,1]$ is a coefficient of the spline. Then, the spline is a described like below. $$x(s) = a_xs^3 + b_xs^2 + c_xs + d_x $$ @@ -26,7 +31,7 @@ $$z(s) = a_zs^3 + b_ys^2 + c_zs + d_z $$ When a hit decision with a line segment is performed, only $x(s),y(s)$ of the above equations are considered, since they are performed in two dimensions. The equation of the line segment is expressed as. -Let $e_i,f_i (i = x, y, z & u = [0,1])$ is a coefficient of the line segment. +Let $e_i,f_i (i = x, y, z)$ $u = [0,1]$ is a coefficient of the line segment. $$x(u) = e_xu + f_x $$ @@ -59,3 +64,7 @@ If the $s$ and $u$ is in $[0,1]$, Catmull-Rom spline and the line segment are de The value of $S$ obtained in this case is the coordinate $S$ in the lane coordinate system. Next, the value of $s$ is substituted into the Catmull-Rom spline equation, and the tangent direction at that point is calculated. The Euler angle is calculated from the difference in orientation between the obtained tangent direction and Entity. + +!!! summary + - The calculation of the posture in the lane coordinate system involves two steps: first, filtering by "which lanes can be matched," and then "calculating the posture in the specific lane coordinate system. + - The parameter that most affects the matching results is the length of the horizontal bar. This length depends on the type of Entity and the timing of the calculation. From e8a211634172638de3a5c192886408fba9a4f9d0 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 16:24:17 +0900 Subject: [PATCH 219/245] update document Signed-off-by: Masaya Kataoka --- .../LanePoseCalculation.md | 21 +++++++++--- .../lane_pose_calculation/UpdateFrame.md | 32 +++++++++++++++++-- 2 files changed, 46 insertions(+), 7 deletions(-) diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md index d4737bac58a..c3b7f86a2cc 100644 --- a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -11,6 +11,23 @@ These are the [timing immediately after the spawn of the Entity](Spawn.md) and t ## Lane coordinate system calculation algorithm for a specific lane +!!! summary + - The calculation of the posture in the lane coordinate system involves two steps: first, filtering by "which lanes can be matched," and then "calculating the posture in the specific lane coordinate system. + - The parameter that most affects the matching results is the length of the horizontal bar. This length depends on the type of Entity and the timing of the calculation. If you want to check the length quickly, please check [this section](#quick-guide-to-horizontal-bar-lengths). + +### Quick guide to horizontal bar lengths + +The unit of the table is meter. + +| EntityType \ Timing of caluculation | [Spawn](Spawn.md) | [UpdateFrame](UpdateFrame.md) | +| ----------------------------------- | ----------------- | -------------------------------------------------------------------------------------- | +| EgoEntity | 2.0 | [(tread of the entity) + 2.0](UpdateFrame.md#calculate-pose-in-lane-coordinate-system) | +| VehicleEntity | 2.0 | N/A | +| PedestrianEntity | 2.0 | N/A | +| MiscObject | 2.0 | N/A | + +### Detail of the lane coordinate system calculation algorithm for a specific lane + After the lanes to be matched have been determined, the calculation of the specific lane coordinate system to be performed is always based on a per spline curve and line segment determination. ![Lane pose calculation](../../image/lane_pose_calculation.png "Lane pose calculation.") @@ -64,7 +81,3 @@ If the $s$ and $u$ is in $[0,1]$, Catmull-Rom spline and the line segment are de The value of $S$ obtained in this case is the coordinate $S$ in the lane coordinate system. Next, the value of $s$ is substituted into the Catmull-Rom spline equation, and the tangent direction at that point is calculated. The Euler angle is calculated from the difference in orientation between the obtained tangent direction and Entity. - -!!! summary - - The calculation of the posture in the lane coordinate system involves two steps: first, filtering by "which lanes can be matched," and then "calculating the posture in the specific lane coordinate system. - - The parameter that most affects the matching results is the length of the horizontal bar. This length depends on the type of Entity and the timing of the calculation. diff --git a/docs/developer_guide/lane_pose_calculation/UpdateFrame.md b/docs/developer_guide/lane_pose_calculation/UpdateFrame.md index 401d777b107..4f767050c0b 100644 --- a/docs/developer_guide/lane_pose_calculation/UpdateFrame.md +++ b/docs/developer_guide/lane_pose_calculation/UpdateFrame.md @@ -29,16 +29,42 @@ $$L_m = max(t_r, t_f) + 2.0$$ ## Non-Ego Entity For non-EgoEntity, the process diverges depending on whether planning is done in the lane coordinate system inside BehaviorPlugin. -If planning is done in the lane coordinate system, there is no need to convert from the map coordinate system to the lane coordinate system after onUpdate is executed. +If planning is done in the lane coordinate system, there is no need to convert from the map coordinate system to the lane coordinate system after update frame function is executed. ### VehicleEntity (with Behavior-Tree) +Only during `follow_polyline_trajectory` execution is planning performed in map coordinate system, but [lane coordinate system calculations are not performed](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/behavior/follow_trajectory.cpp#L546) + ### Vehicle Entity (with Do-Nothing) -While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated at spawn and is not recalculated thereafter. +While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated when spawning entity and is not recalculated thereafter. ### Pedestrian Entity (with Behavior-Tree) +Planning is done in map coordinates in the `walk_straight` and `follow_polyline_trajectory` actions. + +In the `walk_straight` Action, [the pose in the lane coordinate system is calculated.](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L56) +The procedure for calculating the pose in the lane coordinate system at this time is as follows. + +If lane matching was successful in the previous frame, do 1, otherwise do 2 + +1.[Set the length of the horizontal bar to 2.0 and calculate the attitude in the lane coordinate system](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c 27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L72-L77) +2.[Calculate the posture in the lane coordinate system considering the size of the BoundingBox of the Entity](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0 c27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L79-L83) + +If calculation 1 or 2 fails, +3.[Set the length of the horizontal bar to 4.0 and calculate the attitude in the lane coordinate system](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c 27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L86-L91) +If 1 or 2 are successful, then 3 is skipped. + +If the pose could not be calculated in the lane coordinate system by considering up to the result of 3, [the pose calculation in the lane coordinate system is a failure](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L125). + +[Canonicalize pose in lane coordinate system](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L94) to determine the final pose in the lane coordinate system. + +In the `follow_polyline_trajectory` Action, [lane coordinate system calculations are not performed](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/behavior/follow_trajectory.cpp#L546) + ### Pedestrian Entity (with Do-Nothing) -While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated at spawn and is not recalculated thereafter. +While the do-nothing behavior plugin is running, Entity does not move, so the lane coordinate system is calculated when spawning entity and is not recalculated thereafter. + +### MiscObjectEntity + +Misc object entity does not move, so the lane coordinate system is calculated when spawning entity and is not recalculated thereafter. From 26cd60b1762cca9ef04dfc69476e4272363024b3 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 16:25:50 +0900 Subject: [PATCH 220/245] update document Signed-off-by: Masaya Kataoka --- .../lane_pose_calculation/LanePoseCalculation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md index c3b7f86a2cc..467f0fa7a2c 100644 --- a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -23,7 +23,7 @@ The unit of the table is meter. | ----------------------------------- | ----------------- | -------------------------------------------------------------------------------------- | | EgoEntity | 2.0 | [(tread of the entity) + 2.0](UpdateFrame.md#calculate-pose-in-lane-coordinate-system) | | VehicleEntity | 2.0 | N/A | -| PedestrianEntity | 2.0 | N/A | +| PedestrianEntity | 2.0 | [2.0 or 4.0](UpdateFrame.md#pedestrian-entity-with-behavior-tree) | | MiscObject | 2.0 | N/A | ### Detail of the lane coordinate system calculation algorithm for a specific lane From c74f839647af24b3c3a812acaeb1d5105f6f71b3 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 17:02:06 +0900 Subject: [PATCH 221/245] fix to pose Signed-off-by: Masaya Kataoka --- .../lane_pose_calculation/LanePoseCalculation.md | 4 ++-- docs/developer_guide/lane_pose_calculation/UpdateFrame.md | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md index 467f0fa7a2c..3cb600400a6 100644 --- a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -1,7 +1,7 @@ # Lane pose caluculation The calculation method of the lane coordinate system differs from Entity to Entity, and the process of determining which lane to match is complex, including fallback. -In this document, we will show how the posture calculation of the lane coordinate system is performed for each Entity. +In this document, we will show how the pose calculation of the lane coordinate system is performed for each Entity. There are two possible times when the lane coordinate system may be computed for all Entities. These are the [timing immediately after the spawn of the Entity](Spawn.md) and the [timing of the frame update](UpdateFrame.md). @@ -12,7 +12,7 @@ These are the [timing immediately after the spawn of the Entity](Spawn.md) and t ## Lane coordinate system calculation algorithm for a specific lane !!! summary - - The calculation of the posture in the lane coordinate system involves two steps: first, filtering by "which lanes can be matched," and then "calculating the posture in the specific lane coordinate system. + - The calculation of the pose in the lane coordinate system involves two steps: first, filtering by "which lanes can be matched," and then "calculating the pose in the specific lane coordinate system. - The parameter that most affects the matching results is the length of the horizontal bar. This length depends on the type of Entity and the timing of the calculation. If you want to check the length quickly, please check [this section](#quick-guide-to-horizontal-bar-lengths). ### Quick guide to horizontal bar lengths diff --git a/docs/developer_guide/lane_pose_calculation/UpdateFrame.md b/docs/developer_guide/lane_pose_calculation/UpdateFrame.md index 4f767050c0b..ec4863cf14d 100644 --- a/docs/developer_guide/lane_pose_calculation/UpdateFrame.md +++ b/docs/developer_guide/lane_pose_calculation/UpdateFrame.md @@ -48,11 +48,11 @@ The procedure for calculating the pose in the lane coordinate system at this tim If lane matching was successful in the previous frame, do 1, otherwise do 2 -1.[Set the length of the horizontal bar to 2.0 and calculate the attitude in the lane coordinate system](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c 27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L72-L77) -2.[Calculate the posture in the lane coordinate system considering the size of the BoundingBox of the Entity](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0 c27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L79-L83) +1.[Set the length of the horizontal bar to 2.0 and calculate the pose in the lane coordinate system](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c 27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L72-L77) +2.[Calculate the pose in the lane coordinate system considering the size of the BoundingBox of the Entity](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0 c27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L79-L83) If calculation 1 or 2 fails, -3.[Set the length of the horizontal bar to 4.0 and calculate the attitude in the lane coordinate system](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c 27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L86-L91) +3.[Set the length of the horizontal bar to 4.0 and calculate the pose in the lane coordinate system](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c 27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L86-L91) If 1 or 2 are successful, then 3 is skipped. If the pose could not be calculated in the lane coordinate system by considering up to the result of 3, [the pose calculation in the lane coordinate system is a failure](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/behavior_tree_plugin/src/pedestrian/pedestrian_action_node.cpp#L125). From 49074726c9ac9180b05e09523b9b085a76bdd904 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 18:34:33 +0900 Subject: [PATCH 222/245] add new document Signed-off-by: Masaya Kataoka --- .../GetLongitudinalDistance.md | 8 ++++++++ .../LanePoseCalculation.md | 18 +++++++++--------- docs/image/longitudinal_distance.png | Bin 0 -> 219581 bytes mkdocs.yml | 1 + 4 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 docs/developer_guide/lane_pose_calculation/GetLongitudinalDistance.md create mode 100644 docs/image/longitudinal_distance.png diff --git a/docs/developer_guide/lane_pose_calculation/GetLongitudinalDistance.md b/docs/developer_guide/lane_pose_calculation/GetLongitudinalDistance.md new file mode 100644 index 00000000000..b60a2831ff0 --- /dev/null +++ b/docs/developer_guide/lane_pose_calculation/GetLongitudinalDistance.md @@ -0,0 +1,8 @@ +# Lane pose caluculation when getting longitudianl distance + +Attempts to calculate the pose for adjacent lane coordinate systems when measuring longitudinal distance. +The length of the horizontal bar must intersect with the adjacent lanelet, [so it is always 10 m regardless of the entity type.](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/entity/entity_manager.cpp#L375C21-L442) + +![Get longitudinal distance](../../image/longitudinal_distance.png "Getting longitudinal distance.") + +The shorter of the two blue arrows shown in the figure above is the longitudinal distance between entities. diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md index 3cb600400a6..f1527851d27 100644 --- a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -3,8 +3,8 @@ The calculation method of the lane coordinate system differs from Entity to Entity, and the process of determining which lane to match is complex, including fallback. In this document, we will show how the pose calculation of the lane coordinate system is performed for each Entity. -There are two possible times when the lane coordinate system may be computed for all Entities. -These are the [timing immediately after the spawn of the Entity](Spawn.md) and the [timing of the frame update](UpdateFrame.md). +There are 3 possible timings when the lane coordinate system may be computed for all Entities. +These are the [timing immediately after the spawn of the Entity](Spawn.md), the [timing of the frame update](UpdateFrame.md) the [timing of the getting longitudinal distance](GetLongitudinalDistance.md) !!! Note If you are not a simulator developer but a scenario writer, it is sufficient to check [this document](UpdateFrame.md) and [this section](#lane-coordinate-system-calculation-algorithm-for-a-specific-lane), since the distance measurement via condition in used in the OpenSCENARIO is basically done after frame update. @@ -13,18 +13,18 @@ These are the [timing immediately after the spawn of the Entity](Spawn.md) and t !!! summary - The calculation of the pose in the lane coordinate system involves two steps: first, filtering by "which lanes can be matched," and then "calculating the pose in the specific lane coordinate system. - - The parameter that most affects the matching results is the length of the horizontal bar. This length depends on the type of Entity and the timing of the calculation. If you want to check the length quickly, please check [this section](#quick-guide-to-horizontal-bar-lengths). + - The parameter that most affects the matching results is the length of the horizontal bar. This length depends on the type of entity and the timing of the calculation. If you want to check the length quickly, please check [this section](#quick-guide-to-horizontal-bar-lengths). ### Quick guide to horizontal bar lengths The unit of the table is meter. -| EntityType \ Timing of caluculation | [Spawn](Spawn.md) | [UpdateFrame](UpdateFrame.md) | -| ----------------------------------- | ----------------- | -------------------------------------------------------------------------------------- | -| EgoEntity | 2.0 | [(tread of the entity) + 2.0](UpdateFrame.md#calculate-pose-in-lane-coordinate-system) | -| VehicleEntity | 2.0 | N/A | -| PedestrianEntity | 2.0 | [2.0 or 4.0](UpdateFrame.md#pedestrian-entity-with-behavior-tree) | -| MiscObject | 2.0 | N/A | +| EntityType \ Timing of caluculation | [Spawn](Spawn.md) | [UpdateFrame](UpdateFrame.md) | [Fetting longitudinal distance](GetLongitudinalDistance.md) | +| ----------------------------------- | ----------------- | -------------------------------------------------------------------------------------- | ----------------------------------------------------------- | +| EgoEntity | 2.0 | [(tread of the entity) + 2.0](UpdateFrame.md#calculate-pose-in-lane-coordinate-system) | 10 | +| VehicleEntity | 2.0 | N/A | 10 | +| PedestrianEntity | 2.0 | [2.0 or 4.0](UpdateFrame.md#pedestrian-entity-with-behavior-tree) | 10 | +| MiscObject | 2.0 | N/A | 10 | ### Detail of the lane coordinate system calculation algorithm for a specific lane diff --git a/docs/image/longitudinal_distance.png b/docs/image/longitudinal_distance.png new file mode 100644 index 0000000000000000000000000000000000000000..d296025fc65c46e54b751e6ba200bf8a355cfce8 GIT binary patch literal 219581 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%0DvJ5Z1{kHmUKeY2}?fzYF`K6cegUa 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�c#9#{rYtI>FvQuulNd{h$ zE-H2Vf0SO`cCdR}E(ds|Vq1iZAYkj8Wr|IqEH4LhNnQdI;IG~zt%yqq8Q%O*Lb9!EcGCsKptj$(I;llG zsaD{fm1f}d)=ssY)uwdEP~Wsbd5WUQOJzW|CYtcyUP>3x$Kf!M5x&;}?7Sd#Q`UyS zSpVV~%2PS4#C77m*o+r4wP)Id?*#HO!tjbu&_&t=8@4=wGDrCYU{vU;n?@iIFtk4- z-rrw9C#6df#fZkw@(?m?mt2WDxwz<1jny|xNvYJc8gJ|XOpY=@0FS6XkNh^rkUO_j z=(tm?-@3J$pO2gCz+(!>s*2h}ecj6vsvY0Rx-U3Y+5*zt8XqPtb>7jE`cGy%lnRtD z@$IcDf=-V0^sv4`g<-Zu35$yn+8CC!z-L5O18^O@8~y~Zh8<@61}JZ6Q%mIxSLzWg zFO3N3G7%B$o$1Ht7tf4mL=+NFfCB&YN#Q$mb~4h)>hym_HR3Qxh!Oqk*Pmg^r7wX)eAqh6YS-zb2biY`Dpp(b-}w$OsLXt5tkorbW!>8VIQ`jeu@kZFxLIh~by zTCt-#HuX|youLTnm4OO5Ofn>zk|1_*@A4tq7dFnWjCI5M`K?!&UwPcE=2cN2G=bJ3 z6)@!}3lIlPFaIm9lXgKwdHREGHFCF(279NwF9&6muN#@rd*5*{4~i-1(5A^BpK>w2 zrn7WzTc`~OgTHQ^5PSY4E53|e_G7*5{oAF3#FlAUU3XPu#fEv8KZ_y>4{>a6{dWxv zOp}{e;;{vOwZE~JI=HLGJqd{(`-Xc55#>g0QmKan)F+&4HB1(58NKU{Sng&Xlo78m zg*@_$hjS5drg)z_&tsr@7Lpt!f;{Q3DvlrGpwmgBosDn_5>+m%ZQ^rT842Bxuds5? zgJN&84F+M<&L#^b%5$H}&u`A0*qU@sSNw5MtaUW$W>Q&3Y8&@=7U978ZiBAX@NssVJ(kV<^75krnq zUm_=g$uWB-C=&W-$>+aUOO>akV`k2QO#EDXD$F)0H06UZEEE|q{Uv(s;S)8j{!Z#6 zs)rRD)Dlt{@I!h0IkMz3H169=oM5g_dt(3)Ue9HmEGf5D{xMn6Sb2D_vW7Ss#V{xP+cRRCqciG z6?x*0V5lwM^krP3K2t<|p+PiA-`op5i(3;-;i52H2D+0r`~MG#8{gOq>z2zO6bsJZ zzFf*PEKwdR9T2bIqb1|4}1|GUPItu|$qK;m39_q3h^phA(aj1-lP=(KKFE0}l zUMI!|cNad-%*6x^ZZ%jT`q^&N>q@T=)E%sL%A2l!T`qm>YW+D)%@Qsf8&bpG!A1-9 zt@@0b(Pm}Ny*2TWhWKTpIm~_^2_LXarEZ7ow@cZaDcIOZal83$-?$YSWT)>p9wa{2 z8ZGQJ_Gn-3Cu^9y9S{8|umY~cC-52QmumO-o|KG*tyoE|T@zvT6z&e9TD`zJ?;y9k zOglbgwjGbg9j#fvwzKKB$EALvAR^!mpHT0%!x2(qVC%{*&0K!%o+p&2a!N@_t^5;i zkY9Xu{RYFsJsm^M^VS$Q_R$xff7OM1Jzw-VyVBU`c2USaFEQL@x9W45;-gZz}D zheF-VBykB1y9qQ<3OZIy18CU^tZBmheCzT*EV23bna3t}R#x0_&2ex^f&&5qXy$5W z*-9Jh-S(wxHZ5xl77Z8h=^NNu(_kGZEvXSxL!N6bcn5>my}jYy01e2VDRA1|HJx z5>Uw-C++6YgEm9cs!wnGtxmenQTdfE8ru6<>=5P5UW9e8$RHz(uT;wgeBE;v@?5P$ z;>Z|YMYyo{SL(fnUk4rb`vzuLFpZ3iI6)Tub$tBD+r4i&i_E4T2wu{BTiv5?^V=Ut zwa51Ns`DM+?NOO+s_lHt-!o<7R8D^!9Wal=cBme;*B>piRA2Ayf^Kf-XipsYNe-D< zh18dK-4=%f%0_+3FVW)e-Me+3H*WB*mzFjL<}DQD=bcq<$yvQ{PR6LgVdRwZ@+UAnYLrSiJqLyOS8-OEQv@quaE)XZ1_k}(2&u&b|+9^zLX zumAda&o2X|$0< zPD_H+;NW1)_@BRCS%Uf*EpwHgo*t*Yoy~XPx5df%$zF_ZP2aYeHN0tNq*&EI$R=2| zp&Xp?D4xi1%-W}JZ({|wf6kD$WZEiw#L;tXocu5il(H|HjCPF{Z5op@IqeaS}pahEkdUzDeZXAw* zLBRMK%wYZmFl=BA9b=~LL8+TdD*0DUdcJb!V>*^!y)U}ubc2&QD0uiCBVTkHlC&^d zD<>r_Jq|j?36PM$JwKW4?RLQR`}WQ-5@7z%w6kZ=8ZD}bvpsj|`I>1f#X{uIpSpYb zwAobpwVO9LlvR)T&{;f;vaojY?ePf;3L3b(2DKxS3CDk4>$Cyvu++%JBna}*mJhq3 zp*24#Qg1$>BE2ruL5ju8%#)wjW_{|emU%|*tw@WT8!4|@7J~xbgp9R+?&Bw6`}*p^ zl^ugk0;Qwtcz*Fq7*gTzd?tid>H+064pw_tPtS?*@$rz6{f{+KXGh$**B9m3i2RNB zM9#fsoyusudDCj4xU1{FNYdRa{o42td8ypD17`Ulcy0b=vXClPAd;8C=YffC!Ow^+Q)kl6Sjp zsIFkr6Uu`8Q^w}T9T|}Kjs528FKCRPgGvFiMMPYMzOZ5}_O`YyBT2uu?0x1K&o@ri;Xc&|74~^Xo&uD##c3BuK0Y*R|5Cz4>YXM7HKFjYPX0E|? z*ru9E562H70Mz!s-vICS?yc2AqM43CW2$?2trUIG!Wc})8( z`SL{lirQ}hOVW40$djoH6k(CP$3gWA^h@#f1hAa*baMos6R_|*-(64RYERMhjEqEr z&((9cHR0Me%tsZrJ~-dVc7K}j*z(GqO<&a@{IkjwT+vs;$JS3Ls>`yoc|mi-n9#F> zLqjR)4Lr5K$X$8=8J#;O4=fp&fNfmq%1>4_IE+ak%xFU_Ze!+*B@QV;|nt{mEEt&vDDa>P$e zz^7Xdoi-_|X@X)KXPQNbNbfg!5TL8r4O`~pe%Tf*M^i6gbT{ z!G=tazasT;B?@R0XB{2fQYVb^?(2Jc>FfOJeEiqfmC{=}W!83f#tbhOM{E6_ zQvO7-QhYJsI&jkS#Jp#Xzyx%^B1`j6whe+KYJY=9k92z$H>C+0>EmF zjEv9VhdMg{`RrCE#_R4)>k7$iQ>$kyFL|R`I}r-IQ)$HO_!nM9+P3+YoNO}c4XqOzw<4GPvbV*=#IC8R zv^-I~bm@cG{xAAa%-?}0$qpu0(y?Lo{iU8M!qgNFzeP4QHsa#- zw=P^55dfYEQAh_wzA0<{IeJZF!(;Vn5wr<7Q-+9F_CwR0ngR#96yg0i_Jm&zeEz(Y z==_V?Uo>HltndJ(i-7PiSe%a6(0~1Wtou3l;9sw0S5^gRG=Pwy1~u%_Y4yNs^((tx zwsL}k*Wd`97v#T#yQmUa@a{rU%6%&Z1qi34_RM7F z9+Ht!pjfSW$k$7Rawhi5rLMUU+0wxxuxYF(479Y41Kiq3mJK6ULF&TME@>MZ$1VBU z{GzRU`m_JIzQ;2!jQ+zi6cjJL&ipLcfRFqC4&wON*C;q%KKnPBa{9i)KgyAU;!h58 z|E!swO Date: Fri, 16 Feb 2024 18:41:49 +0900 Subject: [PATCH 223/245] fix typo Signed-off-by: Masaya Kataoka --- .../GetLongitudinalDistance.md | 2 +- .../lane_pose_calculation/LanePoseCalculation.md | 14 +++++++------- .../developer_guide/lane_pose_calculation/Spawn.md | 4 ++-- .../lane_pose_calculation/UpdateFrame.md | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/developer_guide/lane_pose_calculation/GetLongitudinalDistance.md b/docs/developer_guide/lane_pose_calculation/GetLongitudinalDistance.md index b60a2831ff0..6a721ea6fef 100644 --- a/docs/developer_guide/lane_pose_calculation/GetLongitudinalDistance.md +++ b/docs/developer_guide/lane_pose_calculation/GetLongitudinalDistance.md @@ -1,4 +1,4 @@ -# Lane pose caluculation when getting longitudianl distance +# Lane pose calculation when getting longitudinal distance Attempts to calculate the pose for adjacent lane coordinate systems when measuring longitudinal distance. The length of the horizontal bar must intersect with the adjacent lanelet, [so it is always 10 m regardless of the entity type.](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/entity/entity_manager.cpp#L375C21-L442) diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md index f1527851d27..a1b6bb2dea7 100644 --- a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -1,4 +1,4 @@ -# Lane pose caluculation +# Lane pose calculation The calculation method of the lane coordinate system differs from Entity to Entity, and the process of determining which lane to match is complex, including fallback. In this document, we will show how the pose calculation of the lane coordinate system is performed for each Entity. @@ -19,12 +19,12 @@ These are the [timing immediately after the spawn of the Entity](Spawn.md), the The unit of the table is meter. -| EntityType \ Timing of caluculation | [Spawn](Spawn.md) | [UpdateFrame](UpdateFrame.md) | [Fetting longitudinal distance](GetLongitudinalDistance.md) | -| ----------------------------------- | ----------------- | -------------------------------------------------------------------------------------- | ----------------------------------------------------------- | -| EgoEntity | 2.0 | [(tread of the entity) + 2.0](UpdateFrame.md#calculate-pose-in-lane-coordinate-system) | 10 | -| VehicleEntity | 2.0 | N/A | 10 | -| PedestrianEntity | 2.0 | [2.0 or 4.0](UpdateFrame.md#pedestrian-entity-with-behavior-tree) | 10 | -| MiscObject | 2.0 | N/A | 10 | +| EntityType \ Timing of calculation | [Spawn](Spawn.md) | [UpdateFrame](UpdateFrame.md) | [Getting longitudinal distance](GetLongitudinalDistance.md) | +| ---------------------------------- | ----------------- | -------------------------------------------------------------------------------------- | ----------------------------------------------------------- | +| EgoEntity | 2.0 | [(tread of the entity) + 2.0](UpdateFrame.md#calculate-pose-in-lane-coordinate-system) | 10 | +| VehicleEntity | 2.0 | N/A | 10 | +| PedestrianEntity | 2.0 | [2.0 or 4.0](UpdateFrame.md#pedestrian-entity-with-behavior-tree) | 10 | +| MiscObject | 2.0 | N/A | 10 | ### Detail of the lane coordinate system calculation algorithm for a specific lane diff --git a/docs/developer_guide/lane_pose_calculation/Spawn.md b/docs/developer_guide/lane_pose_calculation/Spawn.md index 7ba10fd4e9c..f9fd7dfbd1f 100644 --- a/docs/developer_guide/lane_pose_calculation/Spawn.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -1,7 +1,7 @@ -# Lane pose caluculation when spawning +# Lane pose calculation when spawning If you spawn by specifying the lane coordinate system, lane pose calucluation is skipped. -Internally, spawn by specifying the lane coordinate system means specifying LaneltPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html) +Internally, spawn by specifying the lane coordinate system means specifying LaneletPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html) In the OpenSCENARIO , it is to execute a TeleportAction by specifying the LanePosition. ([e.g](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/test_runner/scenario_test_runner/)) If you spawn by specifying the map coordinate system, [lane pose calucluation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is executed. diff --git a/docs/developer_guide/lane_pose_calculation/UpdateFrame.md b/docs/developer_guide/lane_pose_calculation/UpdateFrame.md index ec4863cf14d..e75f6ef35e7 100644 --- a/docs/developer_guide/lane_pose_calculation/UpdateFrame.md +++ b/docs/developer_guide/lane_pose_calculation/UpdateFrame.md @@ -1,4 +1,4 @@ -# Lane pose caluculation when updating frames +# Lane pose calculation when updating frames If the entity's behavioral logic is planned in the lane coordinate system, skip this process. From 26004684fe6076b465041af00f70d3a5c6e4b326 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 18:48:08 +0900 Subject: [PATCH 224/245] fix typo Signed-off-by: Masaya Kataoka --- docs/developer_guide/lane_pose_calculation/Spawn.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/developer_guide/lane_pose_calculation/Spawn.md b/docs/developer_guide/lane_pose_calculation/Spawn.md index f9fd7dfbd1f..47d88424692 100644 --- a/docs/developer_guide/lane_pose_calculation/Spawn.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -1,10 +1,10 @@ # Lane pose calculation when spawning -If you spawn by specifying the lane coordinate system, lane pose calucluation is skipped. +If you spawn by specifying the lane coordinate system, lane pose calculation is skipped. Internally, spawn by specifying the lane coordinate system means specifying LaneletPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html) In the OpenSCENARIO , it is to execute a TeleportAction by specifying the LanePosition. ([e.g](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/test_runner/scenario_test_runner/)) -If you spawn by specifying the map coordinate system, [lane pose calucluation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is executed. +If you spawn by specifying the map coordinate system, [lane pose calculation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is executed. There are several internal implementations of pose calculation in the lane coordinate system implemented in the [HDmapUtils class](https://tier4.github.io/scenario_simulator_v2-api-docs/classhdmap__utils_1_1HdMapUtils.html), but the one used in this case is [here](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L602-L630). From b2eba2e2f3493e0dca4ac27f33838f5be1ed9270 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 18:51:26 +0900 Subject: [PATCH 225/245] modify link Signed-off-by: Masaya Kataoka --- .github/pull_request_samples/example_detail.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_samples/example_detail.md b/.github/pull_request_samples/example_detail.md index c31fe9672cd..e6eff6f1a89 100644 --- a/.github/pull_request_samples/example_detail.md +++ b/.github/pull_request_samples/example_detail.md @@ -28,7 +28,7 @@ This PR fixes how the length of the curve is computed ## References -- [determine-arc-length-of-a-catmull-rom-spline-to-move-at-a-constant-speed](https://gamedev.stackexchange.com/questions/14985/determine-arc-length-of-a-catmull-rom-spline-to-move-at-a-constant-speed) +- [Document about spline curve.](https://people.computing.clemson.edu/~dhouse/courses/405/notes/splines.pdf) - This link is an example and is not directly related to this sample. # Destructive Changes From 9f43e39696eeb4491e52914af9f49ea2be051250 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 19:08:59 +0900 Subject: [PATCH 226/245] fix CHANGELOG Signed-off-by: Masaya Kataoka --- simulation/traffic_simulator/CHANGELOG.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index fdbb3af44b1..670041c7a9e 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -183,9 +183,9 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure * Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 * Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep -* Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support - Feature/drop galactic support -======= +* Merge remote-tracking branch 'origin/master' into refactor/lanelet-id +* remove debug line +* fix case * Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support * Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 * Rename `gelAllCanonicalizedLaneletPoses` to `get...` From 6f0efbc1d935405d3a033221949d8d05a052dbc6 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 19:10:47 +0900 Subject: [PATCH 227/245] fix CHANGELOG Signed-off-by: Masaya Kataoka --- simulation/traffic_simulator/CHANGELOG.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simulation/traffic_simulator/CHANGELOG.rst b/simulation/traffic_simulator/CHANGELOG.rst index 670041c7a9e..bc9149027e9 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -182,10 +182,10 @@ Changelog for package traffic_simulator * Merge remote-tracking branch 'origin/master' into AJD-805/baseline_update_rebased * Merge remote-tracking branch 'origin/master' into feature/RJD-96_detail_message_scenario_failure * Merge pull request `#1069 `_ from tier4/feature/traffic_simulator/follow-trajectory-action-3 -* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep * Merge remote-tracking branch 'origin/master' into refactor/lanelet-id * remove debug line * fix case +* Merge remote-tracking branch 'origin/master' into feature/lanelet2_matching_via_rosdep * Merge pull request `#1087 `_ from tier4/feature/drop_galactic_support * Merge remote-tracking branch 'origin/master' into feature/traffic_simulator/follow-trajectory-action-3 * Rename `gelAllCanonicalizedLaneletPoses` to `get...` From dc13a09d40439db87844704c43a93e610f6b7b7e Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 19:12:55 +0900 Subject: [PATCH 228/245] change example Signed-off-by: Masaya Kataoka --- .github/pull_request_samples/example_detail.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/pull_request_samples/example_detail.md b/.github/pull_request_samples/example_detail.md index e6eff6f1a89..a9beca2f5d2 100644 --- a/.github/pull_request_samples/example_detail.md +++ b/.github/pull_request_samples/example_detail.md @@ -28,8 +28,8 @@ This PR fixes how the length of the curve is computed ## References -- [Document about spline curve.](https://people.computing.clemson.edu/~dhouse/courses/405/notes/splines.pdf) - - This link is an example and is not directly related to this sample. +Please check [this document about spline curve.](https://people.computing.clemson.edu/~dhouse/courses/405/notes/splines.pdf) +This link is an example and is not directly related to this sample. # Destructive Changes From f0de17d0f67f1f4869d3ecdf983494882c0d5885 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 19:16:42 +0900 Subject: [PATCH 229/245] change link Signed-off-by: Masaya Kataoka --- .github/pull_request_samples/example_detail.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/pull_request_samples/example_detail.md b/.github/pull_request_samples/example_detail.md index a9beca2f5d2..caea007de38 100644 --- a/.github/pull_request_samples/example_detail.md +++ b/.github/pull_request_samples/example_detail.md @@ -28,7 +28,7 @@ This PR fixes how the length of the curve is computed ## References -Please check [this document about spline curve.](https://people.computing.clemson.edu/~dhouse/courses/405/notes/splines.pdf) +See also [this document.](https://tier4.github.io/scenario_simulator_v2-docs/) This link is an example and is not directly related to this sample. # Destructive Changes From 1079387540a5c5009cc63071ef6c5fafa0835007 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Fri, 16 Feb 2024 19:25:39 +0900 Subject: [PATCH 230/245] remove unused line Signed-off-by: Masaya Kataoka --- .gitignore | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitignore b/.gitignore index f5b02c3f760..665a3b4b50c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,6 @@ # other settings .vscode -# version control -semantic_version_bump.txt - # backup file *.bak From 2be5ad08ceb2cb55d59e493433ef7a1aedabae81 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 19 Feb 2024 17:03:38 +0900 Subject: [PATCH 231/245] Update docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md Co-authored-by: Kotaro Yoshimoto --- .../lane_pose_calculation/LanePoseCalculation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md index a1b6bb2dea7..95d95ff044a 100644 --- a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -3,7 +3,7 @@ The calculation method of the lane coordinate system differs from Entity to Entity, and the process of determining which lane to match is complex, including fallback. In this document, we will show how the pose calculation of the lane coordinate system is performed for each Entity. -There are 3 possible timings when the lane coordinate system may be computed for all Entities. +There are 3 possible timings when the lane coordinate system is computed for all Entities. These are the [timing immediately after the spawn of the Entity](Spawn.md), the [timing of the frame update](UpdateFrame.md) the [timing of the getting longitudinal distance](GetLongitudinalDistance.md) !!! Note From 585d018af74063441c20f2ca953afa4043b718b1 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 19 Feb 2024 17:03:53 +0900 Subject: [PATCH 232/245] Update docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md Co-authored-by: Kotaro Yoshimoto --- .../lane_pose_calculation/LanePoseCalculation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md index 95d95ff044a..d4399b1f725 100644 --- a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -7,7 +7,7 @@ There are 3 possible timings when the lane coordinate system is computed for all These are the [timing immediately after the spawn of the Entity](Spawn.md), the [timing of the frame update](UpdateFrame.md) the [timing of the getting longitudinal distance](GetLongitudinalDistance.md) !!! Note - If you are not a simulator developer but a scenario writer, it is sufficient to check [this document](UpdateFrame.md) and [this section](#lane-coordinate-system-calculation-algorithm-for-a-specific-lane), since the distance measurement via condition in used in the OpenSCENARIO is basically done after frame update. + It is sufficient to check [this document](UpdateFrame.md) and [this section](#lane-coordinate-system-calculation-algorithm-for-a-specific-lane), if you are not a simulator developer but a scenario writter. That is because the distance measurement via condition of the OpenSCENARIO is done after frame update basically. ## Lane coordinate system calculation algorithm for a specific lane From 5e13a364c7ea58d90870863187c55fdb5feecb78 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 19 Feb 2024 17:04:07 +0900 Subject: [PATCH 233/245] Update docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md Co-authored-by: Kotaro Yoshimoto --- .../lane_pose_calculation/LanePoseCalculation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md index d4399b1f725..d58d962e936 100644 --- a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -4,7 +4,7 @@ The calculation method of the lane coordinate system differs from Entity to Enti In this document, we will show how the pose calculation of the lane coordinate system is performed for each Entity. There are 3 possible timings when the lane coordinate system is computed for all Entities. -These are the [timing immediately after the spawn of the Entity](Spawn.md), the [timing of the frame update](UpdateFrame.md) the [timing of the getting longitudinal distance](GetLongitudinalDistance.md) +These are the [timing immediately after the spawn of the Entity](Spawn.md), the [timing of the frame update](UpdateFrame.md) and the [timing of the getting longitudinal distance](GetLongitudinalDistance.md) !!! Note It is sufficient to check [this document](UpdateFrame.md) and [this section](#lane-coordinate-system-calculation-algorithm-for-a-specific-lane), if you are not a simulator developer but a scenario writter. That is because the distance measurement via condition of the OpenSCENARIO is done after frame update basically. From 9a129771dd8b9a533cf351e7214313fe36fc22c0 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 19 Feb 2024 17:04:18 +0900 Subject: [PATCH 234/245] Update docs/developer_guide/lane_pose_calculation/Spawn.md Co-authored-by: Kotaro Yoshimoto --- docs/developer_guide/lane_pose_calculation/Spawn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/Spawn.md b/docs/developer_guide/lane_pose_calculation/Spawn.md index 47d88424692..0b294d1d635 100644 --- a/docs/developer_guide/lane_pose_calculation/Spawn.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -1,6 +1,6 @@ # Lane pose calculation when spawning -If you spawn by specifying the lane coordinate system, lane pose calculation is skipped. +If you spawn entities by specifying the lane coordinate system, lane pose calculation is skipped. Internally, spawn by specifying the lane coordinate system means specifying LaneletPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html) In the OpenSCENARIO , it is to execute a TeleportAction by specifying the LanePosition. ([e.g](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/test_runner/scenario_test_runner/)) From 435e2ca6883e6c4cee80e7bbf2220239f900c7da Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 19 Feb 2024 17:04:28 +0900 Subject: [PATCH 235/245] Update docs/developer_guide/lane_pose_calculation/Spawn.md Co-authored-by: Kotaro Yoshimoto --- docs/developer_guide/lane_pose_calculation/Spawn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/Spawn.md b/docs/developer_guide/lane_pose_calculation/Spawn.md index 0b294d1d635..6d9444d3af6 100644 --- a/docs/developer_guide/lane_pose_calculation/Spawn.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -1,7 +1,7 @@ # Lane pose calculation when spawning If you spawn entities by specifying the lane coordinate system, lane pose calculation is skipped. -Internally, spawn by specifying the lane coordinate system means specifying LaneletPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html) +Internally, spawning entities by specifying the lane coordinate system means specifying LaneletPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html). In the OpenSCENARIO , it is to execute a TeleportAction by specifying the LanePosition. ([e.g](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/test_runner/scenario_test_runner/)) If you spawn by specifying the map coordinate system, [lane pose calculation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is executed. From 7264a07bcf9ffbdfb583dd1843273648db04bed5 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 19 Feb 2024 17:04:38 +0900 Subject: [PATCH 236/245] Update docs/developer_guide/lane_pose_calculation/Spawn.md Co-authored-by: Kotaro Yoshimoto --- docs/developer_guide/lane_pose_calculation/Spawn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/Spawn.md b/docs/developer_guide/lane_pose_calculation/Spawn.md index 6d9444d3af6..636bdf84caa 100644 --- a/docs/developer_guide/lane_pose_calculation/Spawn.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -13,7 +13,7 @@ In this function, the following procedure is used to calculate the pose in the l ## Search for matching lanes -This procedure falls back to 2 if 1. fails. +This procedure falls back to 2 if 1 fails. If 2 also fails, fallback is performed to 3. If 3 also fails, fallback is performed to 4. From df64a91d63724c07642163b85b2a396c33a0828e Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 19 Feb 2024 17:04:46 +0900 Subject: [PATCH 237/245] Update docs/developer_guide/lane_pose_calculation/Spawn.md Co-authored-by: Kotaro Yoshimoto --- docs/developer_guide/lane_pose_calculation/Spawn.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/developer_guide/lane_pose_calculation/Spawn.md b/docs/developer_guide/lane_pose_calculation/Spawn.md index 636bdf84caa..b99b31319c7 100644 --- a/docs/developer_guide/lane_pose_calculation/Spawn.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -6,8 +6,8 @@ In the OpenSCENARIO , it is to execute a TeleportAction by specifying the LanePo If you spawn by specifying the map coordinate system, [lane pose calculation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is executed. -There are several internal implementations of pose calculation in the lane coordinate system implemented in the [HDmapUtils class](https://tier4.github.io/scenario_simulator_v2-api-docs/classhdmap__utils_1_1HdMapUtils.html), -but the one used in this case is [here](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L602-L630). +There are several internal implementations of pose calculation in the lane coordinate system implemented in the [HDmapUtils class](https://tier4.github.io/scenario_simulator_v2-api-docs/classhdmap__utils_1_1HdMapUtils.html). +The one used in this case is [here](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L602-L630). In this function, the following procedure is used to calculate the pose in the lane coordinate system. From b6cef6d6fad499629b4df00dc26b293303848dc9 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 19 Feb 2024 17:04:55 +0900 Subject: [PATCH 238/245] Update docs/developer_guide/lane_pose_calculation/Spawn.md Co-authored-by: Kotaro Yoshimoto --- docs/developer_guide/lane_pose_calculation/Spawn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/Spawn.md b/docs/developer_guide/lane_pose_calculation/Spawn.md index b99b31319c7..ed5239071eb 100644 --- a/docs/developer_guide/lane_pose_calculation/Spawn.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -4,7 +4,7 @@ If you spawn entities by specifying the lane coordinate system, lane pose calcul Internally, spawning entities by specifying the lane coordinate system means specifying LaneletPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html). In the OpenSCENARIO , it is to execute a TeleportAction by specifying the LanePosition. ([e.g](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/test_runner/scenario_test_runner/)) -If you spawn by specifying the map coordinate system, [lane pose calculation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is executed. +If you spawn entities by specifying the map coordinate system, [lane pose calculation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is performed. There are several internal implementations of pose calculation in the lane coordinate system implemented in the [HDmapUtils class](https://tier4.github.io/scenario_simulator_v2-api-docs/classhdmap__utils_1_1HdMapUtils.html). The one used in this case is [here](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L602-L630). From a83d801de3b61eec1daff6f2e4e623554b11bc73 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 19 Feb 2024 17:05:07 +0900 Subject: [PATCH 239/245] Update docs/developer_guide/lane_pose_calculation/Spawn.md Co-authored-by: Kotaro Yoshimoto --- docs/developer_guide/lane_pose_calculation/Spawn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/Spawn.md b/docs/developer_guide/lane_pose_calculation/Spawn.md index ed5239071eb..9c0c3ebe105 100644 --- a/docs/developer_guide/lane_pose_calculation/Spawn.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -2,7 +2,7 @@ If you spawn entities by specifying the lane coordinate system, lane pose calculation is skipped. Internally, spawning entities by specifying the lane coordinate system means specifying LaneletPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html). -In the OpenSCENARIO , it is to execute a TeleportAction by specifying the LanePosition. ([e.g](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/test_runner/scenario_test_runner/)) +In the OpenSCENARIO, it is to execute a TeleportAction by specifying the LanePosition. ([e.g](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/test_runner/scenario_test_runner/)) If you spawn entities by specifying the map coordinate system, [lane pose calculation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is performed. From a182bfe617e7e55a8c2139a92f2759d4cc685e18 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Mon, 19 Feb 2024 17:06:56 +0900 Subject: [PATCH 240/245] update document Signed-off-by: Masaya Kataoka --- .../lane_pose_calculation/LanePoseCalculation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md index d58d962e936..91ef2359bfa 100644 --- a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -7,7 +7,7 @@ There are 3 possible timings when the lane coordinate system is computed for all These are the [timing immediately after the spawn of the Entity](Spawn.md), the [timing of the frame update](UpdateFrame.md) and the [timing of the getting longitudinal distance](GetLongitudinalDistance.md) !!! Note - It is sufficient to check [this document](UpdateFrame.md) and [this section](#lane-coordinate-system-calculation-algorithm-for-a-specific-lane), if you are not a simulator developer but a scenario writter. That is because the distance measurement via condition of the OpenSCENARIO is done after frame update basically. + It is sufficient to check [this document](UpdateFrame.md) and [this section](#lane-coordinate-system-calculation-algorithm-for-a-specific-lane), if you are not a simulator developer but a scenario writer. That is because the distance measurement via condition of the OpenSCENARIO is done after frame update basically. ## Lane coordinate system calculation algorithm for a specific lane From 466aedf0b2b8880cbfb49982abb2ecedf3b0efec Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 21 Feb 2024 15:59:11 +0900 Subject: [PATCH 241/245] Update docs/developer_guide/lane_pose_calculation/Spawn.md Co-authored-by: Kotaro Yoshimoto --- docs/developer_guide/lane_pose_calculation/Spawn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/Spawn.md b/docs/developer_guide/lane_pose_calculation/Spawn.md index 9c0c3ebe105..cf1a805a94e 100644 --- a/docs/developer_guide/lane_pose_calculation/Spawn.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -4,7 +4,7 @@ If you spawn entities by specifying the lane coordinate system, lane pose calcul Internally, spawning entities by specifying the lane coordinate system means specifying LaneletPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html). In the OpenSCENARIO, it is to execute a TeleportAction by specifying the LanePosition. ([e.g](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/test_runner/scenario_test_runner/)) -If you spawn entities by specifying the map coordinate system, [lane pose calculation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is performed. +If you spawn entities by specifying in the map coordinate system, [lane pose calculation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is performed. There are several internal implementations of pose calculation in the lane coordinate system implemented in the [HDmapUtils class](https://tier4.github.io/scenario_simulator_v2-api-docs/classhdmap__utils_1_1HdMapUtils.html). The one used in this case is [here](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/src/hdmap_utils/hdmap_utils.cpp#L602-L630). From 7da8c256f5c35e8d455e0a209f5e2b1cc853a294 Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 21 Feb 2024 15:59:40 +0900 Subject: [PATCH 242/245] Update docs/developer_guide/lane_pose_calculation/Spawn.md Co-authored-by: Kotaro Yoshimoto --- docs/developer_guide/lane_pose_calculation/Spawn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/Spawn.md b/docs/developer_guide/lane_pose_calculation/Spawn.md index cf1a805a94e..3ed72fbd774 100644 --- a/docs/developer_guide/lane_pose_calculation/Spawn.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -1,6 +1,6 @@ # Lane pose calculation when spawning -If you spawn entities by specifying the lane coordinate system, lane pose calculation is skipped. +If you spawn entities by specifying in the lane coordinate system, lane pose calculation is skipped. Internally, spawning entities by specifying the lane coordinate system means specifying LaneletPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html). In the OpenSCENARIO, it is to execute a TeleportAction by specifying the LanePosition. ([e.g](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/test_runner/scenario_test_runner/)) From 93c098248f1c2ee132251a69595ef3c6d51be1fd Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 21 Feb 2024 15:59:49 +0900 Subject: [PATCH 243/245] Update docs/developer_guide/lane_pose_calculation/Spawn.md Co-authored-by: Kotaro Yoshimoto --- docs/developer_guide/lane_pose_calculation/Spawn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/developer_guide/lane_pose_calculation/Spawn.md b/docs/developer_guide/lane_pose_calculation/Spawn.md index 3ed72fbd774..71a2e6a4a51 100644 --- a/docs/developer_guide/lane_pose_calculation/Spawn.md +++ b/docs/developer_guide/lane_pose_calculation/Spawn.md @@ -1,7 +1,7 @@ # Lane pose calculation when spawning If you spawn entities by specifying in the lane coordinate system, lane pose calculation is skipped. -Internally, spawning entities by specifying the lane coordinate system means specifying LaneletPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html). +Internally, spawning entities by specifying in the lane coordinate system means specifying LaneletPose as the argument pose of the [API::spawn function](https://tier4.github.io/scenario_simulator_v2-api-docs/classtraffic__simulator_1_1API.html). In the OpenSCENARIO, it is to execute a TeleportAction by specifying the LanePosition. ([e.g](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/test_runner/scenario_test_runner/)) If you spawn entities by specifying in the map coordinate system, [lane pose calculation](https://github.com/tier4/scenario_simulator_v2/blob/9f03394f80e5de05cf087db3d00c7be73d27e963/simulation/traffic_simulator/include/traffic_simulator/entity/entity_manager.hpp#L521-L529) is performed. From 929775a6c2974f8ce9229bd9b5a215249beced5b Mon Sep 17 00:00:00 2001 From: Masaya Kataoka Date: Wed, 21 Feb 2024 16:23:47 +0900 Subject: [PATCH 244/245] fix docs Signed-off-by: Masaya Kataoka --- .../lane_pose_calculation/LanePoseCalculation.md | 2 +- docs/developer_guide/lane_pose_calculation/UpdateFrame.md | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md index a1b6bb2dea7..5b08a74294e 100644 --- a/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md +++ b/docs/developer_guide/lane_pose_calculation/LanePoseCalculation.md @@ -33,7 +33,7 @@ After the lanes to be matched have been determined, the calculation of the speci ![Lane pose calculation](../../image/lane_pose_calculation.png "Lane pose calculation.") The centerline of a lane is expressed by the cubic equation [Catmull-Rom spline.](https://en.wikipedia.org/wiki/Centripetal_Catmull%E2%80%93Rom_spline) -Catmull-Rom spline and line perturbation are implemented by finding the multiple solution of one cubic equation. +Catmull-Rom spline and line segment are implemented by finding the multiple solution of one cubic equation. A specific implementation can be found [here](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/common/math/geometry/src/solver/polynomial_solver.cpp#L98-L131) and [here.](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/common/math/geometry/src/spline/hermite_curve.cpp#L124-L187) Let $a_i,b_i,c_i,d_i (i = x, y, z)$ $s = [0,1]$ is a coefficient of the spline. diff --git a/docs/developer_guide/lane_pose_calculation/UpdateFrame.md b/docs/developer_guide/lane_pose_calculation/UpdateFrame.md index e75f6ef35e7..9a49a0dd474 100644 --- a/docs/developer_guide/lane_pose_calculation/UpdateFrame.md +++ b/docs/developer_guide/lane_pose_calculation/UpdateFrame.md @@ -4,11 +4,10 @@ If the entity's behavioral logic is planned in the lane coordinate system, skip ## Ego Entity -Since EgoEntity is controlled by Autoware rather than the behavior plugin, this process is performed for every frame update. +Since EgoEntity is controlled in map coordinates by Autoware rather than in lane coordinates using a motion plugin, this process is performed at each frame update. This process is implemented [here](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/api/api.cpp#L240C9-L240C19) and [here](https://github.com/tier4/scenario_simulator_v2/blob/5f19d39ef29243396f26225976975f0c27914c12/simulation/traffic_simulator/src/entity/ego_entity.cpp#L276-L312). ### Search for matching lanes - This process branches off into 2 or 3 depending on the outcome of 1. If 3 is executed and fails, fallbacks to 4. From 3e1f01b511f30bdba2c78be526593c2d8eb7646e Mon Sep 17 00:00:00 2001 From: Release Bot Date: Wed, 21 Feb 2024 07:38:17 +0000 Subject: [PATCH 245/245] Bump version of scenario_simulator_v2 from version 1.0.1 to version 1.0.2 --- common/math/arithmetic/CHANGELOG.rst | 26 ++++++++++++ common/math/arithmetic/package.xml | 2 +- common/math/geometry/CHANGELOG.rst | 26 ++++++++++++ common/math/geometry/package.xml | 2 +- .../CHANGELOG.rst | 26 ++++++++++++ .../scenario_simulator_exception/package.xml | 2 +- common/simple_junit/CHANGELOG.rst | 26 ++++++++++++ common/simple_junit/package.xml | 2 +- common/status_monitor/CHANGELOG.rst | 26 ++++++++++++ common/status_monitor/package.xml | 2 +- external/concealer/CHANGELOG.rst | 26 ++++++++++++ external/concealer/package.xml | 2 +- map/kashiwanoha_map/CHANGELOG.rst | 26 ++++++++++++ map/kashiwanoha_map/package.xml | 2 +- mock/cpp_mock_scenarios/CHANGELOG.rst | 27 ++++++++++++ mock/cpp_mock_scenarios/package.xml | 2 +- .../CHANGELOG.rst | 26 ++++++++++++ .../package.xml | 2 +- .../openscenario_interpreter/CHANGELOG.rst | 27 ++++++++++++ .../openscenario_interpreter/package.xml | 2 +- .../CHANGELOG.rst | 26 ++++++++++++ .../package.xml | 2 +- .../CHANGELOG.rst | 26 ++++++++++++ .../openscenario_interpreter_msgs/package.xml | 2 +- .../openscenario_preprocessor/CHANGELOG.rst | 27 ++++++++++++ .../openscenario_preprocessor/package.xml | 2 +- .../CHANGELOG.rst | 26 ++++++++++++ .../package.xml | 2 +- .../openscenario_utility/CHANGELOG.rst | 26 ++++++++++++ openscenario/openscenario_utility/package.xml | 2 +- .../openscenario_visualization/CHANGELOG.rst | 26 ++++++++++++ .../openscenario_visualization/package.xml | 2 +- .../CHANGELOG.rst | 6 +++ .../package.xml | 2 +- scenario_simulator_v2/CHANGELOG.rst | 42 +++++++++++++++++++ scenario_simulator_v2/package.xml | 2 +- simulation/behavior_tree_plugin/CHANGELOG.rst | 26 ++++++++++++ simulation/behavior_tree_plugin/package.xml | 2 +- simulation/do_nothing_plugin/CHANGELOG.rst | 26 ++++++++++++ simulation/do_nothing_plugin/package.xml | 2 +- .../simple_sensor_simulator/CHANGELOG.rst | 27 ++++++++++++ .../simple_sensor_simulator/package.xml | 2 +- simulation/simulation_interface/CHANGELOG.rst | 26 ++++++++++++ simulation/simulation_interface/package.xml | 2 +- simulation/traffic_simulator/CHANGELOG.rst | 29 +++++++++++++ simulation/traffic_simulator/package.xml | 2 +- .../traffic_simulator_msgs/CHANGELOG.rst | 26 ++++++++++++ simulation/traffic_simulator_msgs/package.xml | 2 +- test_runner/random_test_runner/CHANGELOG.rst | 27 ++++++++++++ test_runner/random_test_runner/package.xml | 2 +- .../scenario_test_runner/CHANGELOG.rst | 27 ++++++++++++ test_runner/scenario_test_runner/package.xml | 2 +- 52 files changed, 707 insertions(+), 26 deletions(-) diff --git a/common/math/arithmetic/CHANGELOG.rst b/common/math/arithmetic/CHANGELOG.rst index 140707fbf77..fde5eb9415a 100644 --- a/common/math/arithmetic/CHANGELOG.rst +++ b/common/math/arithmetic/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package arithmetic ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/common/math/arithmetic/package.xml b/common/math/arithmetic/package.xml index c2d82fca980..d1c03a6b550 100644 --- a/common/math/arithmetic/package.xml +++ b/common/math/arithmetic/package.xml @@ -2,7 +2,7 @@ arithmetic - 1.0.1 + 1.0.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 1b2b3754495..74171435031 100644 --- a/common/math/geometry/CHANGELOG.rst +++ b/common/math/geometry/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package geometry ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/common/math/geometry/package.xml b/common/math/geometry/package.xml index e3125879e7e..8034a4a2e0f 100644 --- a/common/math/geometry/package.xml +++ b/common/math/geometry/package.xml @@ -2,7 +2,7 @@ geometry - 1.0.1 + 1.0.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 a949c37446a..055762416a1 100644 --- a/common/scenario_simulator_exception/CHANGELOG.rst +++ b/common/scenario_simulator_exception/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package scenario_simulator_exception ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/common/scenario_simulator_exception/package.xml b/common/scenario_simulator_exception/package.xml index 680702d4e0d..f2353897eb9 100644 --- a/common/scenario_simulator_exception/package.xml +++ b/common/scenario_simulator_exception/package.xml @@ -2,7 +2,7 @@ scenario_simulator_exception - 1.0.1 + 1.0.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 19780408d1c..e756537bba1 100644 --- a/common/simple_junit/CHANGELOG.rst +++ b/common/simple_junit/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package junit_exporter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/common/simple_junit/package.xml b/common/simple_junit/package.xml index 53c3c7cf462..fbf8a8668e3 100644 --- a/common/simple_junit/package.xml +++ b/common/simple_junit/package.xml @@ -2,7 +2,7 @@ simple_junit - 1.0.1 + 1.0.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 49d6e31211f..1574a0b1481 100644 --- a/common/status_monitor/CHANGELOG.rst +++ b/common/status_monitor/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package status_monitor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/common/status_monitor/package.xml b/common/status_monitor/package.xml index 26c3f0acee0..8d7f8ceb306 100644 --- a/common/status_monitor/package.xml +++ b/common/status_monitor/package.xml @@ -2,7 +2,7 @@ status_monitor - 1.0.1 + 1.0.2 none Tatsuya Yamasaki Apache License 2.0 diff --git a/external/concealer/CHANGELOG.rst b/external/concealer/CHANGELOG.rst index d794861327c..9ba709b5c2f 100644 --- a/external/concealer/CHANGELOG.rst +++ b/external/concealer/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package concealer ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/external/concealer/package.xml b/external/concealer/package.xml index 7a62ab5f561..55689fece7d 100644 --- a/external/concealer/package.xml +++ b/external/concealer/package.xml @@ -2,7 +2,7 @@ concealer - 1.0.1 + 1.0.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/map/kashiwanoha_map/CHANGELOG.rst b/map/kashiwanoha_map/CHANGELOG.rst index f468bfbb72a..6c0260d3a0e 100644 --- a/map/kashiwanoha_map/CHANGELOG.rst +++ b/map/kashiwanoha_map/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package kashiwanoha_map ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/map/kashiwanoha_map/package.xml b/map/kashiwanoha_map/package.xml index dd9c84ff573..0e651326d8a 100644 --- a/map/kashiwanoha_map/package.xml +++ b/map/kashiwanoha_map/package.xml @@ -2,7 +2,7 @@ kashiwanoha_map - 1.0.1 + 1.0.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 8d4af4731cd..2b89adbb786 100644 --- a/mock/cpp_mock_scenarios/CHANGELOG.rst +++ b/mock/cpp_mock_scenarios/CHANGELOG.rst @@ -2,6 +2,33 @@ Changelog for package cpp_mock_scenarios ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/mock/cpp_mock_scenarios/package.xml b/mock/cpp_mock_scenarios/package.xml index fd06385c063..b1200dcc334 100644 --- a/mock/cpp_mock_scenarios/package.xml +++ b/mock/cpp_mock_scenarios/package.xml @@ -2,7 +2,7 @@ cpp_mock_scenarios - 1.0.1 + 1.0.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 686c1fa76ed..c16454b866d 100644 --- a/openscenario/openscenario_experimental_catalog/CHANGELOG.rst +++ b/openscenario/openscenario_experimental_catalog/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package openscenario_experimental_catalog ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/openscenario/openscenario_experimental_catalog/package.xml b/openscenario/openscenario_experimental_catalog/package.xml index c702003cc33..ef1ecb51292 100644 --- a/openscenario/openscenario_experimental_catalog/package.xml +++ b/openscenario/openscenario_experimental_catalog/package.xml @@ -2,7 +2,7 @@ openscenario_experimental_catalog - 1.0.1 + 1.0.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 d4b7364e0f1..04a90a95018 100644 --- a/openscenario/openscenario_interpreter/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter/CHANGELOG.rst @@ -2,6 +2,33 @@ Changelog for package openscenario_interpreter ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/openscenario/openscenario_interpreter/package.xml b/openscenario/openscenario_interpreter/package.xml index 9f8733af110..53129e7ff55 100644 --- a/openscenario/openscenario_interpreter/package.xml +++ b/openscenario/openscenario_interpreter/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter - 1.0.1 + 1.0.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 be50cb34868..81e72b3e4b2 100644 --- a/openscenario/openscenario_interpreter_example/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_example/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package openscenario_interpreter_example ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/openscenario/openscenario_interpreter_example/package.xml b/openscenario/openscenario_interpreter_example/package.xml index 89ac6dc03aa..257ded32bcf 100644 --- a/openscenario/openscenario_interpreter_example/package.xml +++ b/openscenario/openscenario_interpreter_example/package.xml @@ -3,7 +3,7 @@ openscenario_interpreter_example - 1.0.1 + 1.0.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 db6d54f3a7e..07e2275bf3e 100644 --- a/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_interpreter_msgs/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package openscenario_interpreter_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/openscenario/openscenario_interpreter_msgs/package.xml b/openscenario/openscenario_interpreter_msgs/package.xml index 4fb31c0a306..e425e45e9ab 100644 --- a/openscenario/openscenario_interpreter_msgs/package.xml +++ b/openscenario/openscenario_interpreter_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_interpreter_msgs - 1.0.1 + 1.0.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 344e66be0dc..d9cb9c1e92a 100644 --- a/openscenario/openscenario_preprocessor/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor/CHANGELOG.rst @@ -2,6 +2,33 @@ Changelog for package openscenario_preprocessor ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/openscenario/openscenario_preprocessor/package.xml b/openscenario/openscenario_preprocessor/package.xml index 5228a850c1c..fd07807b648 100644 --- a/openscenario/openscenario_preprocessor/package.xml +++ b/openscenario/openscenario_preprocessor/package.xml @@ -3,7 +3,7 @@ openscenario_preprocessor - 1.0.1 + 1.0.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 ab58a792dc1..9128a00e006 100644 --- a/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst +++ b/openscenario/openscenario_preprocessor_msgs/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package openscenario_preprocessor_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/openscenario/openscenario_preprocessor_msgs/package.xml b/openscenario/openscenario_preprocessor_msgs/package.xml index 0a38b37bdd7..ae2b1ab3562 100644 --- a/openscenario/openscenario_preprocessor_msgs/package.xml +++ b/openscenario/openscenario_preprocessor_msgs/package.xml @@ -2,7 +2,7 @@ openscenario_preprocessor_msgs - 1.0.1 + 1.0.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 696e59948cc..fe2dbb98f94 100644 --- a/openscenario/openscenario_utility/CHANGELOG.rst +++ b/openscenario/openscenario_utility/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package openscenario_utility ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/openscenario/openscenario_utility/package.xml b/openscenario/openscenario_utility/package.xml index 022695b4081..9597af8fc8b 100644 --- a/openscenario/openscenario_utility/package.xml +++ b/openscenario/openscenario_utility/package.xml @@ -2,7 +2,7 @@ openscenario_utility - 1.0.1 + 1.0.2 Utility tools for ASAM OpenSCENARIO 1.2.0 Tatsuya Yamasaki Apache License 2.0 diff --git a/openscenario/openscenario_visualization/CHANGELOG.rst b/openscenario/openscenario_visualization/CHANGELOG.rst index b319bb19d37..a42f851f5ba 100644 --- a/openscenario/openscenario_visualization/CHANGELOG.rst +++ b/openscenario/openscenario_visualization/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package openscenario_visualization ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/openscenario/openscenario_visualization/package.xml b/openscenario/openscenario_visualization/package.xml index 70f2d8a41ff..7ddbfa59c5f 100644 --- a/openscenario/openscenario_visualization/package.xml +++ b/openscenario/openscenario_visualization/package.xml @@ -2,7 +2,7 @@ openscenario_visualization - 1.0.1 + 1.0.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 3ee74c276ca..a528bd95c6b 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,12 @@ Changelog for package real_time_factor_control_rviz_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Contributors: Masaya Kataoka + 1.0.1 (2024-02-15) ------------------ 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 b64177ec3d5..992ebbed8e2 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.0.1 + 1.0.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 dcd27792cc1..f9735b62a05 100644 --- a/scenario_simulator_v2/CHANGELOG.rst +++ b/scenario_simulator_v2/CHANGELOG.rst @@ -2,6 +2,48 @@ Changelog for package scenario_simulator_v2 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* fix CHANGELOG +* fix changelog +* Merge remote-tracking branch 'test/master' into feature/simplify_action +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#17 `_ from merge-queue-testing/fix/release + add conculency and modify commit message +* fix version +* Merge remote-tracking branch 'test/master' into fix/release +* Bump version of scenario_simulator_v2 to version 0.8.1 +* fix version +* [Bot] Bump version of scenario_simulator_v2 to version 0.8.1 +* Merge pull request `#10 `_ from merge-queue-testing/feature/bump_version_action + add trigger +* fix changelog +* update CHANGELOG +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* bump version of scenario_simulator_v2. +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/scenario_simulator_v2/package.xml b/scenario_simulator_v2/package.xml index 1b7bab1157f..27baeb78e87 100644 --- a/scenario_simulator_v2/package.xml +++ b/scenario_simulator_v2/package.xml @@ -2,7 +2,7 @@ scenario_simulator_v2 - 1.0.1 + 1.0.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 2307c4411b3..ae10bc780c3 100644 --- a/simulation/behavior_tree_plugin/CHANGELOG.rst +++ b/simulation/behavior_tree_plugin/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package behavior_tree_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/simulation/behavior_tree_plugin/package.xml b/simulation/behavior_tree_plugin/package.xml index 0cde0c5bee9..d2b5cd0bd85 100644 --- a/simulation/behavior_tree_plugin/package.xml +++ b/simulation/behavior_tree_plugin/package.xml @@ -2,7 +2,7 @@ behavior_tree_plugin - 1.0.1 + 1.0.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 549a0b72981..9fed19b616b 100644 --- a/simulation/do_nothing_plugin/CHANGELOG.rst +++ b/simulation/do_nothing_plugin/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package do_nothing_plugin ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/simulation/do_nothing_plugin/package.xml b/simulation/do_nothing_plugin/package.xml index 34a5961d40b..a5f99575bc9 100644 --- a/simulation/do_nothing_plugin/package.xml +++ b/simulation/do_nothing_plugin/package.xml @@ -2,7 +2,7 @@ do_nothing_plugin - 1.0.1 + 1.0.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 4faed4801b8..f57196c7f7b 100644 --- a/simulation/simple_sensor_simulator/CHANGELOG.rst +++ b/simulation/simple_sensor_simulator/CHANGELOG.rst @@ -2,6 +2,33 @@ Changelog for package simple_sensor_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/simulation/simple_sensor_simulator/package.xml b/simulation/simple_sensor_simulator/package.xml index 20c8bf15350..b060f37c532 100644 --- a/simulation/simple_sensor_simulator/package.xml +++ b/simulation/simple_sensor_simulator/package.xml @@ -1,7 +1,7 @@ simple_sensor_simulator - 1.0.1 + 1.0.2 simple_sensor_simulator package masaya kataoka diff --git a/simulation/simulation_interface/CHANGELOG.rst b/simulation/simulation_interface/CHANGELOG.rst index 5cf161f3836..1a0861a6f3c 100644 --- a/simulation/simulation_interface/CHANGELOG.rst +++ b/simulation/simulation_interface/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package simulation_interface ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/simulation/simulation_interface/package.xml b/simulation/simulation_interface/package.xml index 15635188f13..90517779c98 100644 --- a/simulation/simulation_interface/package.xml +++ b/simulation/simulation_interface/package.xml @@ -2,7 +2,7 @@ simulation_interface - 1.0.1 + 1.0.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 bc9149027e9..8cedfb32785 100644 --- a/simulation/traffic_simulator/CHANGELOG.rst +++ b/simulation/traffic_simulator/CHANGELOG.rst @@ -2,6 +2,35 @@ Changelog for package traffic_simulator ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* fix CHANGELOG +* fix CHANGELOG +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/simulation/traffic_simulator/package.xml b/simulation/traffic_simulator/package.xml index 854fb8b1aea..1637408a9ae 100644 --- a/simulation/traffic_simulator/package.xml +++ b/simulation/traffic_simulator/package.xml @@ -1,7 +1,7 @@ traffic_simulator - 1.0.1 + 1.0.2 control traffic flow masaya kataoka diff --git a/simulation/traffic_simulator_msgs/CHANGELOG.rst b/simulation/traffic_simulator_msgs/CHANGELOG.rst index 56e764462e9..8090b5c3333 100644 --- a/simulation/traffic_simulator_msgs/CHANGELOG.rst +++ b/simulation/traffic_simulator_msgs/CHANGELOG.rst @@ -2,6 +2,32 @@ Changelog for package openscenario_msgs ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/simulation/traffic_simulator_msgs/package.xml b/simulation/traffic_simulator_msgs/package.xml index 261ac4fe672..107386e5aa0 100644 --- a/simulation/traffic_simulator_msgs/package.xml +++ b/simulation/traffic_simulator_msgs/package.xml @@ -2,7 +2,7 @@ traffic_simulator_msgs - 1.0.1 + 1.0.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 11aa4185b91..d35b0f95df8 100644 --- a/test_runner/random_test_runner/CHANGELOG.rst +++ b/test_runner/random_test_runner/CHANGELOG.rst @@ -2,6 +2,33 @@ Changelog for package random_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/test_runner/random_test_runner/package.xml b/test_runner/random_test_runner/package.xml index 5d73c25966b..14bdf4c464b 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.0.1 + 1.0.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 a3be4f7c817..3f7101f4050 100644 --- a/test_runner/scenario_test_runner/CHANGELOG.rst +++ b/test_runner/scenario_test_runner/CHANGELOG.rst @@ -2,6 +2,33 @@ Changelog for package scenario_test_runner ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1.0.2 (2024-02-21) +------------------ +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Merge remote-tracking branch 'origin/master' into doc/lane_pose_calculation +* Bump version of scenario_simulator_v2 from version 0.8.11 to version 0.8.12 +* Bump version of scenario_simulator_v2 from version 0.8.10 to version 0.8.11 +* Bump version of scenario_simulator_v2 from version 0.8.9 to version 0.8.10 +* Bump version of scenario_simulator_v2 from version 0.8.8 to version 0.8.9 +* Bump version of scenario_simulator_v2 from version 0.8.7 to version 0.8.8 +* Bump version of scenario_simulator_v2 from version 0.8.6 to version 0.8.7 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.5 to version 0.8.6 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into fix/release_text +* Bump version of scenario_simulator_v2 from version 0.8.4 to version 0.8.5 +* Bump version of scenario_simulator_v2 from version 0.8.3 to version 0.8.4 +* Bump version of scenario_simulator_v2 from version 0.8.2 to version 0.8.3 +* Bump version of scenario_simulator_v2 from version 0.8.1 to version 0.8.2 +* Merge branch 'master' of https://github.com/merge-queue-testing/scenario_simulator_v2 into feature/restore_barnch +* Bump version of scenario_simulator_v2 from version 0.8.0 to version 0.8.1 +* Merge pull request `#1 `_ from merge-queue-testing/feature/new_release + Feature/new release +* Merge remote-tracking branch 'test/master' into feature/new_release +* Merge pull request `#10 `_ from hakuturu583/test/release + update CHANGELOG +* update CHANGELOG +* Contributors: Masaya Kataoka, Release Bot + 1.0.1 (2024-02-15) ------------------ diff --git a/test_runner/scenario_test_runner/package.xml b/test_runner/scenario_test_runner/package.xml index 0e6bff6c076..9da699fbbfd 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.0.1 + 1.0.2 scenario test runner package Tatsuya Yamasaki Apache License 2.0