Skip to content

Commit

Permalink
Merge branch 'master' into feature/jpblist-update-traveled-distance
Browse files Browse the repository at this point in the history
  • Loading branch information
hakuturu583 authored Oct 3, 2024
2 parents 6e0a727 + 5602645 commit 73938f5
Show file tree
Hide file tree
Showing 71 changed files with 1,628 additions and 149 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/BuildAndRun.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,25 +61,28 @@ jobs:
run: |
vcs import src < src/scenario_simulator_v2/dependency_${{ matrix.rosdistro }}.repos
- name: Resolve rosdep
- name: Resolve rosdep and install colcon mixin
run: |
apt-get update
apt-get install -y python3-pip
apt-get install -y python3-pip python3-colcon-lcov-result lcov
rosdep update --include-eol-distros
rosdep install -iy --from-paths src --rosdistro ${{ matrix.rosdistro }}
colcon mixin add default https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml
colcon mixin update default
shell: bash

- name: Build packages
run: |
source /opt/ros/${{ matrix.rosdistro }}/setup.bash
colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_CPP_MOCK_SCENARIOS=ON --packages-up-to ${{ steps.list_packages.outputs.package_list }}
colcon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release -DBUILD_CPP_MOCK_SCENARIOS=ON -DBUILD_TESTING=true -DCMAKE_CXX_FLAGS='-fprofile-arcs -ftest-coverage' -DCMAKE_C_FLAGS='-fprofile-arcs -ftest-coverage' --packages-up-to ${{ steps.list_packages.outputs.package_list }}
shell: bash

- name: Colcon test
run: |
source /opt/ros/${{ matrix.rosdistro }}/setup.bash
source install/local_setup.bash
colcon test --packages-select ${{ steps.list_packages.outputs.package_list }}
colcon test --event-handlers console_cohesion+ --packages-select ${{ steps.list_packages.outputs.package_list }}
colcon lcov-result --packages-select ${{ steps.list_packages.outputs.package_list }}
shell: bash

- name: Show test result
Expand All @@ -97,6 +100,13 @@ jobs:
./src/scenario_simulator_v2/.github/workflows/workflow.sh ./src/scenario_simulator_v2/test_runner/scenario_test_runner/config/workflow.txt global_frame_rate:=20
shell: bash

- name: Upload Lcov result
uses: actions/upload-artifact@v4
with:
name: lcov
path: lcov
retention-days: 1

# - name: Basic test
# run: |
# source install/setup.bash
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/custom_spell.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"AUTORCC",
"Canonicalized",
"canonicalizing",
"cfamily",
"classname",
"Cmyk",
"Dawid",
Expand All @@ -15,11 +16,8 @@
"DWITH_INTEGRATION_TEST",
"engageable",
"euclidian",
"hakuturu",
"Kataoka",
"libunwind",
"linelint",
"Masaya",
"Mersenne",
"Monic",
"Moszynski",
Expand All @@ -43,7 +41,6 @@
"Tschirnhaus",
"walltime",
"xerces",
"xercesc",
"yamacir-kit"
"xercesc"
]
}
41 changes: 41 additions & 0 deletions common/math/arithmetic/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,47 @@ Changelog for package arithmetic
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

4.3.8 (2024-10-02)
------------------
* Merge branch 'master' into 1377/isInLanelet
* Merge branch 'master' into 1377/isInLanelet
* Contributors: Grzegorz Maj, Masaya Kataoka

4.3.7 (2024-09-27)
------------------
* Merge branch 'master' into feature/sonar_cloud
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/sonar_cloud
* Contributors: Masaya Kataoka

4.3.6 (2024-09-27)
------------------

4.3.5 (2024-09-27)
------------------
* Merge branch 'master' into feature/lcov
* Contributors: Masaya Kataoka

4.3.4 (2024-09-27)
------------------
* Merge branch 'master' into RJD-1201/fix_quick_start
* Contributors: SzymonParapura

4.3.3 (2024-09-26)
------------------
* Merge branch 'master' into fix/acquire-position-action
* Merge branch 'master' into fix/acquire-position-action
* Merge branch 'master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Contributors: Tatsuya Yamasaki, yamacir-kit

4.3.2 (2024-09-24)
------------------
* Merge branch 'master' into fix/imu_frame
* Merge branch 'master' into fix/imu_frame
* Contributors: Kotaro Yoshimoto

4.3.1 (2024-09-19)
------------------
* Merge branch 'master' into fix/fix-eigen-variable-definition
Expand Down
2 changes: 1 addition & 1 deletion common/math/arithmetic/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>arithmetic</name>
<version>4.3.1</version>
<version>4.3.8</version>
<description>arithmetic library for scenario_simulator_v2</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
41 changes: 41 additions & 0 deletions common/math/geometry/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,47 @@ Changelog for package geometry
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

4.3.8 (2024-10-02)
------------------
* Merge branch 'master' into 1377/isInLanelet
* Merge branch 'master' into 1377/isInLanelet
* Contributors: Grzegorz Maj, Masaya Kataoka

4.3.7 (2024-09-27)
------------------
* Merge branch 'master' into feature/sonar_cloud
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/sonar_cloud
* Contributors: Masaya Kataoka

4.3.6 (2024-09-27)
------------------

4.3.5 (2024-09-27)
------------------
* Merge branch 'master' into feature/lcov
* Contributors: Masaya Kataoka

4.3.4 (2024-09-27)
------------------
* Merge branch 'master' into RJD-1201/fix_quick_start
* Contributors: SzymonParapura

4.3.3 (2024-09-26)
------------------
* Merge branch 'master' into fix/acquire-position-action
* Merge branch 'master' into fix/acquire-position-action
* Merge branch 'master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Contributors: Tatsuya Yamasaki, yamacir-kit

4.3.2 (2024-09-24)
------------------
* Merge branch 'master' into fix/imu_frame
* Merge branch 'master' into fix/imu_frame
* Contributors: Kotaro Yoshimoto

4.3.1 (2024-09-19)
------------------
* Merge branch 'master' into fix/fix-eigen-variable-definition
Expand Down
2 changes: 1 addition & 1 deletion common/math/geometry/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>geometry</name>
<version>4.3.1</version>
<version>4.3.8</version>
<description>geometry math library for scenario_simulator_v2 application</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<license>Apache License 2.0</license>
Expand Down
41 changes: 41 additions & 0 deletions common/scenario_simulator_exception/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,47 @@ Changelog for package scenario_simulator_exception
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

4.3.8 (2024-10-02)
------------------
* Merge branch 'master' into 1377/isInLanelet
* Merge branch 'master' into 1377/isInLanelet
* Contributors: Grzegorz Maj, Masaya Kataoka

4.3.7 (2024-09-27)
------------------
* Merge branch 'master' into feature/sonar_cloud
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/sonar_cloud
* Contributors: Masaya Kataoka

4.3.6 (2024-09-27)
------------------

4.3.5 (2024-09-27)
------------------
* Merge branch 'master' into feature/lcov
* Contributors: Masaya Kataoka

4.3.4 (2024-09-27)
------------------
* Merge branch 'master' into RJD-1201/fix_quick_start
* Contributors: SzymonParapura

4.3.3 (2024-09-26)
------------------
* Merge branch 'master' into fix/acquire-position-action
* Merge branch 'master' into fix/acquire-position-action
* Merge branch 'master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Contributors: Tatsuya Yamasaki, yamacir-kit

4.3.2 (2024-09-24)
------------------
* Merge branch 'master' into fix/imu_frame
* Merge branch 'master' into fix/imu_frame
* Contributors: Kotaro Yoshimoto

4.3.1 (2024-09-19)
------------------
* Merge branch 'master' into fix/fix-eigen-variable-definition
Expand Down
2 changes: 1 addition & 1 deletion common/scenario_simulator_exception/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>scenario_simulator_exception</name>
<version>4.3.1</version>
<version>4.3.8</version>
<description>Exception types for scenario simulator</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
41 changes: 41 additions & 0 deletions common/simple_junit/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,47 @@ Changelog for package junit_exporter
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

4.3.8 (2024-10-02)
------------------
* Merge branch 'master' into 1377/isInLanelet
* Merge branch 'master' into 1377/isInLanelet
* Contributors: Grzegorz Maj, Masaya Kataoka

4.3.7 (2024-09-27)
------------------
* Merge branch 'master' into feature/sonar_cloud
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/sonar_cloud
* Contributors: Masaya Kataoka

4.3.6 (2024-09-27)
------------------

4.3.5 (2024-09-27)
------------------
* Merge branch 'master' into feature/lcov
* Contributors: Masaya Kataoka

4.3.4 (2024-09-27)
------------------
* Merge branch 'master' into RJD-1201/fix_quick_start
* Contributors: SzymonParapura

4.3.3 (2024-09-26)
------------------
* Merge branch 'master' into fix/acquire-position-action
* Merge branch 'master' into fix/acquire-position-action
* Merge branch 'master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Contributors: Tatsuya Yamasaki, yamacir-kit

4.3.2 (2024-09-24)
------------------
* Merge branch 'master' into fix/imu_frame
* Merge branch 'master' into fix/imu_frame
* Contributors: Kotaro Yoshimoto

4.3.1 (2024-09-19)
------------------
* Merge branch 'master' into fix/fix-eigen-variable-definition
Expand Down
2 changes: 1 addition & 1 deletion common/simple_junit/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>simple_junit</name>
<version>4.3.1</version>
<version>4.3.8</version>
<description>Lightweight JUnit library for ROS 2</description>
<maintainer email="[email protected]">Masaya Kataoka</maintainer>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
Expand Down
41 changes: 41 additions & 0 deletions common/status_monitor/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,47 @@ Changelog for package status_monitor
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
* Contributors: Masaya Kataoka

4.3.8 (2024-10-02)
------------------
* Merge branch 'master' into 1377/isInLanelet
* Merge branch 'master' into 1377/isInLanelet
* Contributors: Grzegorz Maj, Masaya Kataoka

4.3.7 (2024-09-27)
------------------
* Merge branch 'master' into feature/sonar_cloud
* Merge branch 'master' of https://github.com/tier4/scenario_simulator_v2 into feature/sonar_cloud
* Contributors: Masaya Kataoka

4.3.6 (2024-09-27)
------------------

4.3.5 (2024-09-27)
------------------
* Merge branch 'master' into feature/lcov
* Contributors: Masaya Kataoka

4.3.4 (2024-09-27)
------------------
* Merge branch 'master' into RJD-1201/fix_quick_start
* Contributors: SzymonParapura

4.3.3 (2024-09-26)
------------------
* Merge branch 'master' into fix/acquire-position-action
* Merge branch 'master' into fix/acquire-position-action
* Merge branch 'master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Merge remote-tracking branch 'origin/master' into fix/acquire-position-action
* Contributors: Tatsuya Yamasaki, yamacir-kit

4.3.2 (2024-09-24)
------------------
* Merge branch 'master' into fix/imu_frame
* Merge branch 'master' into fix/imu_frame
* Contributors: Kotaro Yoshimoto

4.3.1 (2024-09-19)
------------------
* Merge branch 'master' into fix/fix-eigen-variable-definition
Expand Down
2 changes: 1 addition & 1 deletion common/status_monitor/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>status_monitor</name>
<version>4.3.1</version>
<version>4.3.8</version>
<description>none</description>
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
<license>Apache License 2.0</license>
Expand Down
Loading

0 comments on commit 73938f5

Please sign in to comment.