Skip to content

Commit 62af6fe

Browse files
christophfroehlichchristophfroehlich
authored
Use ros2_control_cmake (#293)
1 parent b7a1688 commit 62af6fe

12 files changed

+104
-25
lines changed

‎.github/workflows/jazzy-binary-build.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,3 @@ jobs:
3131
ros_distro: ${{ matrix.ROS_DISTRO }}
3232
ros_repo: ${{ matrix.ROS_REPO }}
3333
ref_for_scheduled_build: jazzy
34-
binary_clang:
35-
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
36-
with:
37-
ros_distro: jazzy
38-
ros_repo: testing
39-
ref_for_scheduled_build: jazzy
40-
additional_debs: clang
41-
c_compiler: clang
42-
cxx_compiler: clang++
43-
not_test_build: true

‎.github/workflows/jazzy-debian-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ jobs:
1818
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
1919
with:
2020
ros_distro: jazzy
21+
upstream_workspace: realtime_tools.jazzy.repos
2122
ref_for_scheduled_build: jazzy

‎.github/workflows/jazzy-rhel-semi-binary-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ jobs:
1818
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
1919
with:
2020
ros_distro: jazzy
21+
upstream_workspace: realtime_tools.jazzy.repos
2122
ref_for_scheduled_build: jazzy

‎.github/workflows/jazzy-semi-binary-build.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Jazzy Semi-Binary Build
2+
# author: Denis Štogl <[email protected]>
3+
# description: 'Build & test all dependencies from released (binary) packages.'
4+
5+
on:
6+
workflow_dispatch:
7+
pull_request:
8+
branches:
9+
- jazzy
10+
push:
11+
branches:
12+
- jazzy
13+
schedule:
14+
# Run every morning to detect flakiness and broken dependencies
15+
- cron: '03 1 * * *'
16+
17+
concurrency:
18+
# cancel previous runs of the same workflow, except for pushes on jazzy branch
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
21+
22+
jobs:
23+
binary:
24+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
25+
with:
26+
ros_distro: jazzy
27+
ros_repo: testing
28+
ref_for_scheduled_build: jazzy
29+
upstream_workspace: realtime_tools.jazzy.repos
30+
binary_clang:
31+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
32+
with:
33+
ros_distro: jazzy
34+
ros_repo: testing
35+
ref_for_scheduled_build: jazzy
36+
upstream_workspace: realtime_tools.jazzy.repos
37+
additional_debs: clang
38+
c_compiler: clang
39+
cxx_compiler: clang++
40+
not_test_build: true

‎.github/workflows/rolling-binary-build.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,3 @@ jobs:
3131
ros_distro: ${{ matrix.ROS_DISTRO }}
3232
ros_repo: ${{ matrix.ROS_REPO }}
3333
ref_for_scheduled_build: master
34-
binary_clang:
35-
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
36-
with:
37-
ros_distro: rolling
38-
ros_repo: testing
39-
ref_for_scheduled_build: master
40-
additional_debs: clang
41-
c_compiler: clang
42-
cxx_compiler: clang++
43-
not_test_build: true

‎.github/workflows/rolling-debian-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ jobs:
1818
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
1919
with:
2020
ros_distro: rolling
21+
upstream_workspace: realtime_tools.rolling.repos
2122
ref_for_scheduled_build: master

‎.github/workflows/rolling-rhel-semi-binary-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ jobs:
1818
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
1919
with:
2020
ros_distro: rolling
21+
upstream_workspace: realtime_tools.rolling.repos
2122
ref_for_scheduled_build: master

‎.github/workflows/rolling-semi-binary-build.yml

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
name: Rolling Semi-Binary Build
2+
# author: Denis Štogl <[email protected]>
3+
# description: 'Build & test all dependencies from released (binary) packages.'
4+
5+
on:
6+
workflow_dispatch:
7+
pull_request:
8+
branches:
9+
- master
10+
push:
11+
branches:
12+
- master
13+
schedule:
14+
# Run every morning to detect flakiness and broken dependencies
15+
- cron: '03 1 * * *'
16+
17+
concurrency:
18+
# cancel previous runs of the same workflow, except for pushes on master branch
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
21+
22+
jobs:
23+
binary:
24+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
ROS_DISTRO: [rolling]
29+
ROS_REPO: [testing]
30+
with:
31+
ros_distro: ${{ matrix.ROS_DISTRO }}
32+
ros_repo: ${{ matrix.ROS_REPO }}
33+
ref_for_scheduled_build: master
34+
upstream_workspace: realtime_tools.${{ matrix.ROS_DISTRO }}.repos
35+
binary_clang:
36+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
37+
with:
38+
ros_distro: rolling
39+
ros_repo: testing
40+
ref_for_scheduled_build: master
41+
upstream_workspace: realtime_tools.rolling.repos
42+
additional_debs: clang
43+
c_compiler: clang
44+
cxx_compiler: clang++
45+
not_test_build: true

‎CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
cmake_minimum_required(VERSION 3.16)
22
project(realtime_tools LANGUAGES CXX)
33

4-
if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)")
5-
add_compile_options(-Wall -Wextra -Wpedantic -Werror=conversion -Werror=unused-but-set-variable
6-
-Werror=return-type -Werror=shadow -Werror=format)
7-
endif()
4+
find_package(ros2_control_cmake REQUIRED)
5+
set_compiler_options()
86

97
if(WIN32)
108
add_compile_definitions(
@@ -15,7 +13,7 @@ if(WIN32)
1513
WIN32_LEAN_AND_MEAN
1614
)
1715
# set the same behavior for windows as it is on linux
18-
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
16+
export_windows_symbols()
1917
endif()
2018

2119
set(THIS_PACKAGE_INCLUDE_DEPENDS

‎package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
<buildtool_export_depend>ament_cmake</buildtool_export_depend>
2121

22+
<build_depend>ros2_control_cmake</build_depend>
23+
2224
<depend>libboost-dev</depend>
2325
<depend>rclcpp</depend>
2426
<depend>rclcpp_action</depend>

‎realtime_tools.jazzy.repos

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
repositories:
2+
ros-controls/ros2_control_cmake:
3+
type: git
4+
url: https://github.com/ros-controls/ros2_control_cmake.git
5+
version: master

‎realtime_tools.rolling.repos

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
repositories:
2+
ros-controls/ros2_control_cmake:
3+
type: git
4+
url: https://github.com/ros-controls/ros2_control_cmake.git
5+
version: master

0 commit comments

Comments
 (0)