Skip to content

Commit 60c0509

Browse files
author
Felix Exner (fexner)
authored
Adapt ci for humble branch (#544)
* Add mergify backport rule for humble * Update branch references for Humble in main README * Update build badges to reference scheduled builds We do the same for foxy and galactic which do not live on the main branch. * Remove humble builds on main branch except for the schedules * Do not build ros2_controllers from upstream workspace anymore With the latest ros2_controllers release this is no longer required.
1 parent 6dc5d4d commit 60c0509

8 files changed

+23
-73
lines changed

.github/mergify.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
pull_request_rules:
2+
- name: Backport to humble branch
3+
conditions:
4+
- base=main
5+
- label=backport-humble
6+
actions:
7+
backport:
8+
branches:
9+
- humble
10+
211
- name: Backport to galactic branch
312
conditions:
413
- base=main

.github/workflows/humble-binary-build.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
name: Humble Binary Build
22
on:
3-
pull_request:
4-
branches:
5-
- main
6-
push:
7-
branches:
8-
- main
93
schedule:
104
# Run every morning to detect flakiness and broken dependencies
115
- cron: '13 4 * * *'
@@ -25,6 +19,8 @@ jobs:
2519
NOT_TEST_DOWNSTREAM: true
2620
steps:
2721
- uses: actions/checkout@v1
22+
with:
23+
ref: humble
2824
- uses: 'ros-industrial/industrial_ci@master'
2925
env:
3026
ROS_DISTRO: ${{ matrix.ROS_DISTRO }}

.github/workflows/humble-execution-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v1
2626
with:
27-
ref: main
27+
ref: humble
2828
- name: start ursim
2929
run: |
3030
.github/dockerursim/build_and_run_docker_ursim.sh

.github/workflows/humble-semi-binary-build.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
name: Humble Semi-Binary Build
22
on:
3-
pull_request:
4-
branches:
5-
- main
6-
push:
7-
branches:
8-
- main
93
schedule:
104
# Run every morning to detect flakiness and broken dependencies
115
- cron: '03 5 * * *'
@@ -25,6 +19,8 @@ jobs:
2519
NOT_TEST_DOWNSTREAM: true
2620
steps:
2721
- uses: actions/checkout@v1
22+
with:
23+
ref: humble
2824
- uses: 'ros-industrial/industrial_ci@master'
2925
env:
3026
ROS_DISTRO: ${{ matrix.ROS_DISTRO }}

.github/workflows/humble-source-build.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Check also [presentations and videos](ur_robot_driver/doc/resources/README.md) a
2727
<th>Branch</th>
2828
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/foxy">foxy</a></td>
2929
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/galactic">galactic</a></td>
30-
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/main">main</a></td>
30+
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/humble">humble</a></td>
3131
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/main">main</a></td>
3232
</tr>
3333
<tr>
@@ -61,16 +61,16 @@ Check also [presentations and videos](ur_robot_driver/doc/resources/README.md) a
6161
</a>
6262
</td>
6363
<td>
64-
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-binary-build.yml?query=branch%3Amain+">
65-
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-binary-build.yml/badge.svg?branch=main"
64+
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-binary-build.yml?query=event%3Aschedule++">
65+
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-binary-build.yml/badge.svg?event=schedule"
6666
alt="Humble Binary Build"/>
6767
</a> <br />
68-
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-semi-binary-build.yml?query=branch%3Amain+">
69-
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-semi-binary-build.yml/badge.svg?branch=main"
68+
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-semi-binary-build.yml?query=event%3Aschedule++">
69+
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-semi-binary-build.yml/badge.svg?event=schedule"
7070
alt="Humble Semi-Binary Build"/>
7171
</a> <br />
72-
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-source-build.yml?branch=main">
73-
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-source-build.yml/badge.svg?branch=main"
72+
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-source-build.yml?query=branch%3Ahumble">
73+
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/humble-source-build.yml/badge.svg?branch=humble"
7474
alt="Humble Source Build"/>
7575
</a>
7676
</td>
@@ -146,7 +146,8 @@ Deprecation: The `ur_bringup` package is deprecated and will be removed from Iro
146146
1. [Install ROS2 Rolling](https://docs.ros.org/en/rolling/Installation/Ubuntu-Install-Debians.html).
147147
For using this driver with ROS2 `foxy`. Checkout [foxy
148148
branch](https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/foxy), for using it
149-
with ROS2 ``galactic``, use the [galactic branch](https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/galactic).
149+
with ROS2 ``galactic``, use the [galactic branch](https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/galactic), for using it
150+
with ROS2 ``humble``, use the [galactic branch](https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/humble).
150151

151152
2. Make sure that `colcon`, its extensions and `vcs` are installed:
152153
```

Universal_Robots_ROS2_Driver-not-released.humble.repos

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,3 @@
44
# Once Upstream packages are released and synced to the target distributions in the required
55
# version, the entry in this file shall be removed again.
66
repositories:
7-
ros2_controllers:
8-
type: git
9-
url: https://github.com/ros-controls/ros2_controllers.git
10-
version: 2.13.0

Universal_Robots_ROS2_Driver-not-released.rolling.repos

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,3 @@
44
# Once Upstream packages are released and synced to the target distributions in the required
55
# version, the entry in this file shall be removed again.
66
repositories:
7-
ros2_controllers:
8-
type: git
9-
url: https://github.com/ros-controls/ros2_controllers.git
10-
version: 2.13.0

0 commit comments

Comments
 (0)