Skip to content

Commit 0e1afdf

Browse files
asherikovasherikov
committed
ros2param WIP
1 parent 21df44f commit 0e1afdf

Some content is hidden

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

46 files changed

+1017
-133
lines changed

‎.github/workflows/head_2.yml

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-22.04
1313

1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- run: sudo make install-deps
1717
- run: $APT fakeroot devscripts build-essential
1818
- run: |
@@ -30,7 +30,7 @@ jobs:
3030
ROS_CI_DESKTOP: focal
3131

3232
steps:
33-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
3434
- run: sudo make install-ros ROS_DISTRO=$ROS_DISTRO UBUNTU_DISTRO=$ROS_CI_DESKTOP
3535
- run: rosdep update
3636
- run: sudo make install-deps
@@ -45,7 +45,7 @@ jobs:
4545
clang_noros:
4646
runs-on: ubuntu-22.04
4747
steps:
48-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
4949
- run: sudo apt update
5050
- run: sudo make install-deps
5151
- run: make build-tests TYPE=Debug OPTIONS=noros TARGETS="all" TC=clang ARGS=-V
@@ -54,16 +54,33 @@ jobs:
5454
jammy_gcc_noros:
5555
runs-on: ubuntu-22.04
5656
steps:
57-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
5858
- run: sudo apt update
5959
- run: sudo make install-deps
6060
- run: make build-tests TYPE=Debug OPTIONS=noros TARGETS="all" TC=gcc ARGS=-V
6161

62+
jammy_gcc_ros:
63+
runs-on: ubuntu-22.04
64+
65+
env:
66+
ROS_DISTRO: humble
67+
ROS_HOSTNAME: localhost
68+
ROS_CI_DESKTOP: jammy
69+
70+
steps:
71+
- uses: actions/checkout@v4
72+
- run: sudo make install-ros ROS_DISTRO=$ROS_DISTRO UBUNTU_DISTRO=$ROS_CI_DESKTOP
73+
- run: rosdep update
74+
- run: sudo make install-deps
75+
- run: |
76+
source /opt/ros/$ROS_DISTRO/setup.bash
77+
make build-tests TYPE=Debug OPTIONS=ros2 TARGETS="all" TC=gcc ARGS=-V
78+
6279
6380
focal_gcc_noros:
6481
runs-on: ubuntu-20.04
6582
steps:
66-
- uses: actions/checkout@v3
83+
- uses: actions/checkout@v4
6784
- run: sudo apt update
6885
- run: sudo make install-deps
6986
- run: make build-tests TYPE=Debug OPTIONS=noros TARGETS="all" TC=gcc ARGS=-V
@@ -78,7 +95,7 @@ jobs:
7895
ROS_CI_DESKTOP: focal
7996

8097
steps:
81-
- uses: actions/checkout@v3
98+
- uses: actions/checkout@v4
8299
- run: sudo make install-ros ROS_DISTRO=$ROS_DISTRO UBUNTU_DISTRO=$ROS_CI_DESKTOP
83100
- run: rosdep update
84101
- run: sudo make install-deps
@@ -96,7 +113,7 @@ jobs:
96113
ROS_CI_DESKTOP: focal
97114

98115
steps:
99-
- uses: actions/checkout@v3
116+
- uses: actions/checkout@v4
100117
- run: sudo make install-ros ROS_DISTRO=$ROS_DISTRO UBUNTU_DISTRO=$ROS_CI_DESKTOP
101118
- run: rosdep update
102119
- run: sudo make install-deps
@@ -109,7 +126,7 @@ jobs:
109126
runs-on: ubuntu-22.04
110127

111128
steps:
112-
- uses: actions/checkout@v3
129+
- uses: actions/checkout@v4
113130
- run: sudo apt update
114131
- run: $APT cppcheck
115132
- run: $APT python3-pip python3-setuptools
@@ -127,7 +144,7 @@ jobs:
127144
ROS_CI_DESKTOP: focal
128145

129146
steps:
130-
- uses: actions/checkout@v3
147+
- uses: actions/checkout@v4
131148
- run: sudo make install-ros ROS_DISTRO=$ROS_DISTRO UBUNTU_DISTRO=$ROS_CI_DESKTOP
132149
- run: rosdep update
133150
- run: sudo make install-deps
@@ -141,7 +158,7 @@ jobs:
141158
runs-on: ubuntu-22.04
142159

143160
steps:
144-
- uses: actions/checkout@v3
161+
- uses: actions/checkout@v4
145162
- run: sudo apt update
146163
- run: sudo make install-deps
147164
- run: $APT clang-tools-14 clang-tidy-14

‎.github/workflows/tag.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
DEB_TARGET: jammy
1919

2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- run: sudo make install-deps
2323
- run: $APT fakeroot devscripts build-essential
2424
- run: make deb-build DEB_TARGET=$DEB_TARGET
@@ -36,7 +36,7 @@ jobs:
3636
DEB_TARGET: focal
3737

3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
- run: sudo make install-ros ROS_DISTRO=$ROS_DISTRO UBUNTU_DISTRO=$ROS_CI_DESKTOP
4141
- run: rosdep update
4242
- run: sudo make install-deps

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ option (ARILES_VERBOSE "Verbose build" ON)
3030
option (ARILES_BUILD_REGRESSION_TESTS "Build regression tests." ON)
3131
option (ARILES_CCACHE "Enable ccache if available" ON)
3232
set (ARILES_DEB_TARGETS "" CACHE STRING "Enable debian package generation.")
33-
set (ARILES_CPP_STANDARD "11" CACHE STRING "14 is required for boost >= 1.82, 11 is still ok for ariles")
33+
set (ARILES_CPP_STANDARD "17" CACHE STRING "must not be older than 17")
3434

3535
# install parameters
3636
set (ARILES_PKGCONFIG_INSTALL_PATH "" CACHE STRING "pkg-config pc-file install path, not installed if empty")

‎Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ test-ros: clean
140140
${MAKE} build-tests TC=${TC} TYPE=Debug OPTIONS=ros TARGETS="${TARGETS}" EXTRA_CMAKE_PARAM="${EXTRA_CMAKE_PARAM}"
141141

142142

143+
test-ros2: clean
144+
#${MAKE} build-tests TC=${TC} TYPE=Debug OPTIONS=default TARGETS="${TARGETS}" EXTRA_CMAKE_PARAM="${EXTRA_CMAKE_PARAM}"
145+
${MAKE} build-tests TC=${TC} TYPE=Debug OPTIONS=ros2 TARGETS="${TARGETS}" EXTRA_CMAKE_PARAM="${EXTRA_CMAKE_PARAM}"
146+
147+
143148
test-noros: clean
144149
${MAKE} build-tests TC=${TC} TYPE=Debug OPTIONS=noros TARGETS="${TARGETS}" EXTRA_CMAKE_PARAM="${EXTRA_CMAKE_PARAM}"
145150
${MAKE} clangcheck SCANBUILD=scan-build15 OPTIONS=noros_tidy

‎cmake/cmakeut_compiler_flags.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ function(cmakeut_compiler_flags STANDARD)
9191
set(CMAKE_CXX_CLANG_TIDY "${CMAKE_CXX_CLANG_TIDY},-cppcoreguidelines-pro-bounds-array-to-pointer-decay,-hicpp-no-array-decay")
9292
# long functions are ok
9393
set(CMAKE_CXX_CLANG_TIDY "${CMAKE_CXX_CLANG_TIDY},-google-readability-function-size,-readability-function-size,-hicpp-function-size")
94+
# do not enforce nested namespace concatenation
95+
set(CMAKE_CXX_CLANG_TIDY "${CMAKE_CXX_CLANG_TIDY},-modernize-concat-nested-namespaces")
9496

9597

9698
# overly restrictive fuchsia stuff

‎cmake/options_deb_packages_bionic.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ set(ARILES_BUILD_REGRESSION_TESTS "OFF" CACHE STRING "")
55

66
set(ARILES_VISITORS_DEFAULT_MODE "ON" CACHE STRING "")
77
set(ARILES_VISITOR_rosparam "$ENV{ROS_DISTRO}" CACHE STRING "")
8+
set(ARILES_VISITOR_ros2param "OFF" CACHE STRING "")

‎cmake/options_deb_packages_focal.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ set(ARILES_BUILD_REGRESSION_TESTS "OFF" CACHE STRING "")
66
set(ARILES_VISITORS_DEFAULT_MODE "ON" CACHE STRING "")
77
set(ARILES_VISITOR_rosparam "$ENV{ROS_DISTRO}" CACHE STRING "")
88
set(ARILES_VISITOR_msgpack "OFF" CACHE STRING "")
9+
set(ARILES_VISITOR_ros2param "OFF" CACHE STRING "")

‎cmake/options_deb_packages_jammy.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ set(ARILES_BUILD_REGRESSION_TESTS "OFF" CACHE STRING "")
55

66
set(ARILES_VISITORS_DEFAULT_MODE "ON" CACHE STRING "")
77
set(ARILES_VISITOR_rosparam "OFF" CACHE STRING "")
8+
set(ARILES_VISITOR_ros2param "$ENV{ROS_DISTRO}" CACHE STRING "")

‎cmake/options_deb_packages_xenial.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ set(ARILES_VISITORS_DEFAULT_MODE "ON" CACHE STRING "")
66
set(ARILES_VISITOR_rosparam "$ENV{ROS_DISTRO}" CACHE STRING "")
77
set(ARILES_VISITOR_jsonnet "OFF" CACHE STRING "")
88
set(ARILES_VISITOR_msgpack "OFF" CACHE STRING "")
9+
set(ARILES_VISITOR_ros2param "OFF" CACHE STRING "")

‎cmake/options_default.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
set(ARILES_CPP_SANITIZERS "ON" CACHE STRING "")
1+
#set(ARILES_CPP_SANITIZERS "ON" CACHE STRING "")

0 commit comments

Comments
 (0)