Skip to content

Commit 1224fbd

Browse files
authored
Merge branch 'master' into feature/render-omitted-light-bulb
2 parents f9ca79b + b3ec542 commit 1224fbd

File tree

72 files changed

+771
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+771
-56
lines changed

.github/workflows/BuildAndRun.yaml

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
fail-fast: false
3434
matrix:
3535
rosdistro: [humble]
36-
runs_on: [ubuntu-22.04] # macos-14 is added for arm support. See also https://x.com/github/status/1752458943245189120?s=20
36+
runs_on: [ubuntu-22.04, ubuntu-22.04-arm]
3737
cmake_build_type: [RelWithDebInfo, Release] # Debug build type is currently unavailable. @TODO Fix problem and add Debug build.
3838
steps:
3939
- name: Suppress warnings
@@ -76,26 +76,32 @@ jobs:
7676
colcon mixin update default
7777
shell: bash
7878

79-
- name: Install sonar-scanner and build-wrapper
80-
uses: sonarsource/sonarcloud-github-c-cpp@v3
79+
- name: Install Build Wrapper
80+
uses: SonarSource/sonarqube-scan-action/[email protected]
81+
id: build_wrapper
8182
env:
8283
SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
8384

8485
- name: Build with SonarCloud Build Wrapper
86+
# Note: `-Wno-error=class-memaccess` is temporary workaround for aarch64 GCC error
87+
# This should be removed when Eigen is updated in Ubuntu package repository
88+
# See also: https://gitlab.com/libeigen/eigen/-/issues/2326
8589
run: |
8690
source /opt/ros/${{ matrix.rosdistro }}/setup.bash
87-
build-wrapper-linux-x86-64 --out-dir src/scenario_simulator_v2/bw-output \
91+
${{ steps.build_wrapper.outputs.build-wrapper-binary }} --out-dir src/scenario_simulator_v2/bw-output \
8892
colcon build --symlink-install \
8993
--cmake-args \
9094
-DCMAKE_BUILD_TYPE=${{ matrix.cmake_build_type }} \
9195
-DBUILD_CPP_MOCK_SCENARIOS=ON \
9296
-DBUILD_TESTING=true \
93-
-DCMAKE_CXX_FLAGS='-fprofile-arcs -ftest-coverage' \
97+
-DCMAKE_CXX_FLAGS='-fprofile-arcs -ftest-coverage -Wno-error=class-memaccess' \
9498
-DCMAKE_C_FLAGS='-fprofile-arcs -ftest-coverage' \
9599
--packages-up-to ${{ steps.list_packages.outputs.package_list }}
96100
shell: bash
97101

98102
- name: Colcon test
103+
# ARM testing is currently broken
104+
if: matrix.runs_on != 'ubuntu-22.04-arm'
99105
run: |
100106
source /opt/ros/${{ matrix.rosdistro }}/setup.bash
101107
source install/local_setup.bash
@@ -104,6 +110,7 @@ jobs:
104110
shell: bash
105111

106112
- name: generate gcov report for sonarcloud
113+
if: matrix.runs_on != 'ubuntu-22.04-arm'
107114
run: gcovr -r src/scenario_simulator_v2 build --sonarqube coverage.xml
108115

109116
- name: Show test result
@@ -115,6 +122,7 @@ jobs:
115122
shell: bash
116123

117124
- name: Scenario test
125+
if: matrix.runs_on != 'ubuntu-22.04-arm'
118126
run: |
119127
source install/setup.bash
120128
source install/local_setup.bash
@@ -123,6 +131,7 @@ jobs:
123131

124132
- name: Scenario test (optional)
125133
id: optional-scenario-test
134+
if: matrix.runs_on != 'ubuntu-22.04-arm'
126135
run: |
127136
source install/setup.bash
128137
source install/local_setup.bash
@@ -133,7 +142,7 @@ jobs:
133142
shell: bash
134143

135144
- uses: actions/github-script@v7
136-
if: steps.optional-scenario-test.outputs.failure > 0
145+
if: steps.optional-scenario-test.outputs.failure > 0 && matrix.runs_on != 'ubuntu-22.04-arm'
137146
with:
138147
github-token: ${{ secrets.GITHUB_TOKEN }}
139148
script: |
@@ -151,26 +160,32 @@ jobs:
151160
152161
- name: Upload Lcov result
153162
uses: actions/upload-artifact@v4
163+
if: matrix.runs_on != 'ubuntu-22.04-arm'
154164
with:
155165
name: lcov-${{ matrix.cmake_build_type }}
156166
path: lcov
157167
retention-days: 1
158168

159169
- name: Upload Gcov result
160170
uses: actions/upload-artifact@v4
171+
if: matrix.runs_on != 'ubuntu-22.04-arm'
161172
with:
162173
name: coverage${{ matrix.cmake_build_type }}.xml
163174
path: coverage.xml
164175
retention-days: 1
165176

166-
- name: Run SonarCloud scan
177+
- name: SonarQube Scan
178+
uses: SonarSource/[email protected]
179+
# In ARM build, SonarQube result should be same as x86 build because no test runs
180+
if: matrix.runs_on != 'ubuntu-22.04-arm'
167181
env:
168182
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
169183
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
170-
SONAR_HOST_URL: https://sonarcloud.io/
171-
working-directory: src/scenario_simulator_v2/
172-
run: sonar-scanner --define sonar.cfamily.compile-commands="bw-output/compile_commands.json"
173-
184+
SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
185+
with:
186+
args: >
187+
--define sonar.cfamily.compile-commands="src/scenario_simulator_v2/bw-output/compile_commands.json"
188+
projectBaseDir: src/scenario_simulator_v2/
174189
# - name: Basic test
175190
# run: |
176191
# source install/setup.bash

.github/workflows/DocumentationLinkCheck.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
schedule:
77
- cron: 0 0 * * *
88
pull_request:
9-
9+
paths:
10+
- "**/*.md"
1011
jobs:
1112
linkChecker:
1213
runs-on: ubuntu-latest
@@ -18,6 +19,6 @@ jobs:
1819
uses: lycheeverse/[email protected]
1920
with:
2021
fail: true
21-
args: "--verbose --no-progress './**/*.md' './**/*.html' --timeout 1000 --max-concurrency 32 -T 1 --retry-wait-time 10"
22+
args: "--verbose --no-progress './**/*.md' './**/*.html' --timeout 1000 --max-concurrency 1 -T 1 --retry-wait-time 10"
2223
env:
2324
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

common/agnocast_wrapper/CHANGELOG.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,26 @@
22
Changelog for package agnocast_wrapper
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
16.3.7 (2025-05-15)
6+
-------------------
7+
* Merge branch 'master' into fix/mics-objects-model3d
8+
* Merge branch 'master' into fix/mics-objects-model3d
9+
* Contributors: Tatsuya Yamasaki
10+
11+
16.3.6 (2025-05-14)
12+
-------------------
13+
* Merge branch 'master' into feature/arm64-buildtest
14+
* Merge branch 'master' into feature/arm64-buildtest
15+
* Contributors: Kotaro Yoshimoto, ぐるぐる
16+
17+
16.3.5 (2025-05-12)
18+
-------------------
19+
* Merge branch 'master' into fix/missing-rviz-config-and-npc-start
20+
* Contributors: SzymonParapura
21+
22+
16.3.4 (2025-05-12)
23+
-------------------
24+
525
16.3.3 (2025-05-02)
626
-------------------
727

common/agnocast_wrapper/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>agnocast_wrapper</name>
5-
<version>16.3.3</version>
5+
<version>16.3.7</version>
66
<description>A wrapper package for agnocast</description>
77
<maintainer email="[email protected]">Mateusz Palczuk</maintainer>
88
<license>Apache License 2.0</license>

common/get_parameter/CHANGELOG.rst

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,29 @@
22
Changelog for package get_parameter
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
16.3.7 (2025-05-15)
6+
-------------------
7+
* Merge branch 'master' into fix/mics-objects-model3d
8+
* Merge branch 'master' into fix/mics-objects-model3d
9+
* Contributors: Tatsuya Yamasaki
10+
11+
16.3.6 (2025-05-14)
12+
-------------------
13+
* Merge branch 'master' into feature/arm64-buildtest
14+
* Merge branch 'master' into feature/arm64-buildtest
15+
* Contributors: Kotaro Yoshimoto, ぐるぐる
16+
17+
16.3.5 (2025-05-12)
18+
-------------------
19+
* Merge pull request `#1588 <https://github.com/tier4/scenario_simulator_v2/issues/1588>`_ from tier4/fix/missing-rviz-config-and-npc-start
20+
* Merge branch 'master' into fix/missing-rviz-config-and-npc-start
21+
* Merge branch 'fix/duplicated-parameter-nodes' into fix/missing-rviz-config-and-npc-start
22+
* Force at most one parameter node for each process and guarantee unique name of this node by adding pid to the name
23+
* Contributors: Kotaro Yoshimoto, Mateusz Palczuk, SzymonParapura
24+
25+
16.3.4 (2025-05-12)
26+
-------------------
27+
528
16.3.3 (2025-05-02)
629
-------------------
730

common/get_parameter/include/get_parameter/get_parameter.hpp

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,26 @@
1515
#ifndef COMMON__GET_PARAMETER_HPP_
1616
#define COMMON__GET_PARAMETER_HPP_
1717

18+
#include <unistd.h>
19+
1820
#include <rclcpp/rclcpp.hpp>
1921

2022
namespace common
2123
{
24+
/**
25+
* @brief Get the Node object for parameter obtaining.
26+
* This provides a one node for parameter obtaining for the whole executable, as opposed to template
27+
* function that creates a new node for each type of parameter. To guarantee the node name is unique
28+
* (Autoware in some versions requires this to run) we append the process id.
29+
*/
30+
inline auto getParameterNode() -> rclcpp::Node &
31+
{
32+
static rclcpp::Node node{
33+
[](std::string name_base) { return name_base + "_pid" + std::to_string(getpid()); }(__func__),
34+
"simulation"};
35+
return node;
36+
}
37+
2238
template <typename T>
2339
auto getParameter(
2440
const rclcpp::node_interfaces::NodeParametersInterface::SharedPtr & node,
@@ -33,8 +49,7 @@ auto getParameter(
3349
template <typename T>
3450
auto getParameter(const std::string & name, T value = {})
3551
{
36-
static auto node = rclcpp::Node(__func__, "simulation");
37-
return getParameter(node.get_node_parameters_interface(), name, value);
52+
return getParameter(getParameterNode().get_node_parameters_interface(), name, value);
3853
}
3954
} // namespace common
4055

common/get_parameter/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>get_parameter</name>
5-
<version>16.3.3</version>
5+
<version>16.3.7</version>
66
<description>Thin wrapper for rclcpp::Node::get_parameter</description>
77
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
88
<license>Apache License 2.0</license>

common/math/arithmetic/CHANGELOG.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,26 @@ Changelog for package arithmetic
2121
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
2222
* Contributors: Masaya Kataoka
2323

24+
16.3.7 (2025-05-15)
25+
-------------------
26+
* Merge branch 'master' into fix/mics-objects-model3d
27+
* Merge branch 'master' into fix/mics-objects-model3d
28+
* Contributors: Tatsuya Yamasaki
29+
30+
16.3.6 (2025-05-14)
31+
-------------------
32+
* Merge branch 'master' into feature/arm64-buildtest
33+
* Merge branch 'master' into feature/arm64-buildtest
34+
* Contributors: Kotaro Yoshimoto, ぐるぐる
35+
36+
16.3.5 (2025-05-12)
37+
-------------------
38+
* Merge branch 'master' into fix/missing-rviz-config-and-npc-start
39+
* Contributors: SzymonParapura
40+
41+
16.3.4 (2025-05-12)
42+
-------------------
43+
2444
16.3.3 (2025-05-02)
2545
-------------------
2646

common/math/arithmetic/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>arithmetic</name>
5-
<version>16.3.3</version>
5+
<version>16.3.7</version>
66
<description>arithmetic library for scenario_simulator_v2</description>
77
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
88
<license>Apache License 2.0</license>

common/math/geometry/CHANGELOG.rst

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,26 @@ Changelog for package geometry
2121
* Merge remote-tracking branch 'origin/master' into feature/publish_empty_context
2222
* Contributors: Masaya Kataoka
2323

24+
16.3.7 (2025-05-15)
25+
-------------------
26+
* Merge branch 'master' into fix/mics-objects-model3d
27+
* Merge branch 'master' into fix/mics-objects-model3d
28+
* Contributors: Tatsuya Yamasaki
29+
30+
16.3.6 (2025-05-14)
31+
-------------------
32+
* Merge branch 'master' into feature/arm64-buildtest
33+
* Merge branch 'master' into feature/arm64-buildtest
34+
* Contributors: Kotaro Yoshimoto, ぐるぐる
35+
36+
16.3.5 (2025-05-12)
37+
-------------------
38+
* Merge branch 'master' into fix/missing-rviz-config-and-npc-start
39+
* Contributors: SzymonParapura
40+
41+
16.3.4 (2025-05-12)
42+
-------------------
43+
2444
16.3.3 (2025-05-02)
2545
-------------------
2646

0 commit comments

Comments
 (0)