Skip to content

Commit 0776e22

Browse files
christophfroehlichmergify[bot]
authored andcommitted
[CI] debian + RHEL updates (#985)
(cherry picked from commit 0bcb77b) # Conflicts: # .github/workflows/galactic-rhel-binary-build.yml # .github/workflows/rolling-rhel-binary-build.yml
1 parent 2ac7bb2 commit 0776e22

File tree

6 files changed

+131
-20
lines changed

6 files changed

+131
-20
lines changed

.github/workflows/galactic-rhel-binary-build.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD:.github/workflows/galactic-rhel-binary-build.yml
12
name: Galactic RHEL Binary Build
23
on:
34
workflow_dispatch:
@@ -7,6 +8,12 @@ on:
78
branches:
89
- galactic
910
push:
11+
=======
12+
name: RHEL Iron Binary Build
13+
on:
14+
workflow_dispatch:
15+
pull_request:
16+
>>>>>>> 0bcb77b ([CI] debian + RHEL updates (#985)):.github/workflows/iron-rhel-binary-build.yml
1017
branches:
1118
- galactic
1219
schedule:
@@ -25,9 +32,15 @@ jobs:
2532
- uses: actions/checkout@v4
2633
with:
2734
path: src/ros2_controllers
28-
- run: |
35+
- name: Install dependencies
36+
run: |
2937
rosdep update
30-
rosdep install -iy --from-path src/ros2_controllers
38+
rosdep install -iyr --from-path src/ros2_controllers || true
39+
- name: Build and test
40+
# source also underlay workspace with generate_parameter_library on rhel9
41+
run: |
3142
source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
32-
colcon build
33-
colcon test
43+
source /opt/ros2_ws/install/setup.bash
44+
colcon build --packages-skip rqt_joint_trajectory_controller
45+
colcon test --packages-skip rqt_joint_trajectory_controller
46+
colcon test-result --verbose
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Debian Humble Build
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- humble
7+
schedule:
8+
# Run every day to detect flakiness and broken dependencies
9+
- cron: '03 1 * * *'
10+
11+
12+
jobs:
13+
humble_debian:
14+
name: Humble debian build
15+
runs-on: ubuntu-latest
16+
env:
17+
ROS_DISTRO: humble
18+
container: ghcr.io/ros-controls/ros:humble-debian
19+
steps:
20+
- uses: actions/checkout@v4
21+
with:
22+
path: src/ros2_controllers
23+
- name: Build and test
24+
shell: bash
25+
run: |
26+
source /opt/ros2_ws/install/setup.bash
27+
vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos
28+
colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
29+
colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller control_msgs controller_manager_msgs
30+
colcon test-result --verbose
Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1-
name: Humble RHEL Binary Build
1+
name: RHEL Humble Binary Build
22
on:
33
workflow_dispatch:
4-
branches:
5-
- humble
64
pull_request:
75
branches:
86
- humble
9-
push:
10-
branches:
11-
- humble
127
schedule:
138
# Run every day to detect flakiness and broken dependencies
149
- cron: '03 2 * * *'
1510

16-
1711
jobs:
1812
humble_rhel_binary:
1913
name: Humble RHEL binary build
@@ -25,9 +19,13 @@ jobs:
2519
- uses: actions/checkout@v4
2620
with:
2721
path: src/ros2_controllers
28-
- run: |
22+
- name: Install dependencies
23+
run: |
2924
rosdep update
30-
rosdep install -iy --from-path src/ros2_controllers
25+
rosdep install -iyr --from-path src/ros2_controllers || true
26+
- name: Build and test
27+
run: |
3128
source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
32-
colcon build
33-
colcon test
29+
colcon build --packages-skip rqt_joint_trajectory_controller
30+
colcon test --packages-skip rqt_joint_trajectory_controller
31+
colcon test-result --verbose
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Debian Iron Build
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- iron
7+
schedule:
8+
# Run every day to detect flakiness and broken dependencies
9+
- cron: '03 1 * * *'
10+
11+
12+
jobs:
13+
iron_debian:
14+
name: Iron debian build
15+
runs-on: ubuntu-latest
16+
env:
17+
ROS_DISTRO: iron
18+
container: ghcr.io/ros-controls/ros:iron-debian
19+
steps:
20+
- uses: actions/checkout@v4
21+
with:
22+
path: src/ros2_controllers
23+
- name: Build and test
24+
shell: bash
25+
run: |
26+
source /opt/ros2_ws/install/setup.bash
27+
vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos
28+
colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
29+
colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller control_msgs controller_manager_msgs
30+
colcon test-result --verbose
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Debian Rolling Build
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- master
7+
schedule:
8+
# Run every day to detect flakiness and broken dependencies
9+
- cron: '03 1 * * *'
10+
11+
12+
jobs:
13+
rolling_debian:
14+
name: Rolling debian build
15+
runs-on: ubuntu-latest
16+
env:
17+
ROS_DISTRO: rolling
18+
container: ghcr.io/ros-controls/ros:rolling-debian
19+
steps:
20+
- uses: actions/checkout@v4
21+
with:
22+
path: src/ros2_controllers
23+
- name: Build and test
24+
shell: bash
25+
run: |
26+
source /opt/ros2_ws/install/setup.bash
27+
vcs import src < src/ros2_controllers/ros2_controllers.${{ env.ROS_DISTRO }}.repos
28+
colcon build --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
29+
colcon test --packages-skip rqt_controller_manager rqt_joint_trajectory_controller
30+
colcon test-result --verbose

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

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
name: Rolling RHEL Binary Build
1+
name: RHEL Rolling Binary Build
22
on:
33
workflow_dispatch:
4+
<<<<<<< HEAD
45
branches:
56
- master
67
pull_request:
78
branches:
89
- master
910
push:
11+
=======
12+
pull_request:
13+
>>>>>>> 0bcb77b ([CI] debian + RHEL updates (#985))
1014
branches:
1115
- master
1216
schedule:
@@ -25,9 +29,15 @@ jobs:
2529
- uses: actions/checkout@v4
2630
with:
2731
path: src/ros2_controllers
28-
- run: |
32+
- name: Install dependencies
33+
run: |
2934
rosdep update
30-
rosdep install -iy --from-path src/ros2_controllers
35+
rosdep install -iyr --from-path src/ros2_controllers || true
36+
- name: Build and test
37+
# source also underlay workspace with generate_parameter_library on rhel9
38+
run: |
3139
source /opt/ros/${{ env.ROS_DISTRO }}/setup.bash
32-
colcon build
33-
colcon test
40+
source /opt/ros2_ws/install/setup.bash
41+
colcon build --packages-skip rqt_joint_trajectory_controller
42+
colcon test --packages-skip rqt_joint_trajectory_controller
43+
colcon test-result --verbose

0 commit comments

Comments
 (0)