Skip to content

Commit 8825f63

Browse files
authored
Main branch updates for lyrical branch (UniversalRobots#1870)
* Add backport-lyrical mergify rule * Update lyrical workflows to only run scheduled * Fix branches
1 parent a717fea commit 8825f63

7 files changed

Lines changed: 18 additions & 31 deletions

File tree

.github/mergify.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,14 @@ pull_request_rules:
3131
- kilted
3232
labels:
3333
- kilted
34+
35+
- name: Backport to lyrical branch
36+
conditions:
37+
- base=main
38+
- label=backport-lyrical
39+
actions:
40+
backport:
41+
branches:
42+
- lyrical
43+
labels:
44+
- lyrical

.github/workflows/lyrical-binary-main.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
name: Lyrical Binary Build Main
22
on:
33
workflow_dispatch:
4-
pull_request:
5-
branches:
6-
- main
7-
push:
8-
branches:
9-
- main
104
schedule:
115
# Run every morning to detect flakiness and broken dependencies
126
- cron: '13 4 * * *'
@@ -17,7 +11,7 @@ jobs:
1711
with:
1812
ros_distro: lyrical
1913
ros_repo: main
20-
ref_for_scheduled_build: main
14+
ref_for_scheduled_build: lyrical
2115
rosdep_skip_keys: >-
2216
moveit_configs_utils
2317
moveit_kinematics

.github/workflows/lyrical-binary-testing.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
name: Lyrical Binary Build Testing
22
on:
33
workflow_dispatch:
4-
pull_request:
5-
branches:
6-
- main
7-
push:
8-
branches:
9-
- main
104
schedule:
115
# Run every morning to detect flakiness and broken dependencies
126
- cron: '13 4 * * *'
@@ -17,7 +11,7 @@ jobs:
1711
with:
1812
ros_distro: lyrical
1913
ros_repo: testing
20-
ref_for_scheduled_build: main
14+
ref_for_scheduled_build: lyrical
2115
rosdep_skip_keys: >-
2216
moveit_configs_utils
2317
moveit_kinematics

.github/workflows/lyrical-semi-binary-main.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
name: Lyrical Semi Binary Build Main
22
on:
33
workflow_dispatch:
4-
pull_request:
5-
branches:
6-
- main
7-
push:
8-
branches:
9-
- main
104
schedule:
115
# Run every morning to detect flakiness and broken dependencies
126
- cron: '13 4 * * *'
@@ -18,7 +12,7 @@ jobs:
1812
ros_distro: lyrical
1913
ros_repo: main
2014
upstream_workspace: Universal_Robots_ROS2_Driver.lyrical.repos
21-
ref_for_scheduled_build: main
15+
ref_for_scheduled_build: lyrical
2216
rosdep_skip_keys: >-
2317
moveit_configs_utils
2418
moveit_kinematics

.github/workflows/lyrical-semi-binary-testing.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
name: Lyrical Semi Binary Build Testing
22
on:
33
workflow_dispatch:
4-
pull_request:
5-
branches:
6-
- main
7-
push:
8-
branches:
9-
- main
104
schedule:
115
# Run every morning to detect flakiness and broken dependencies
126
- cron: '13 4 * * *'
@@ -18,7 +12,7 @@ jobs:
1812
ros_distro: lyrical
1913
ros_repo: testing
2014
upstream_workspace: Universal_Robots_ROS2_Driver.lyrical.repos
21-
ref_for_scheduled_build: main
15+
ref_for_scheduled_build: lyrical
2216
rosdep_skip_keys: >-
2317
moveit_configs_utils
2418
moveit_kinematics

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Check also [presentations and videos](ur_robot_driver/doc/resources/README.md) a
2929
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/humble">humble</a></td>
3030
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/jazzy">jazzy</a></td>
3131
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/kilted">kilted</a></td>
32-
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/lyrical">main</a></td>
32+
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/lyrical">lyrical</a></td>
3333
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/main">main</a></td>
3434
</tr>
3535
<tr>

ci_status.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ red pipeline there should be a corresponding issue labeled with [ci-failure](htt
1515
<tr>
1616
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/humble">humble</a></td>
1717
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/jazzy">jazzy</a></td>
18-
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/main">kilted</a></td>
19-
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/main">lyrical</a></td>
18+
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/kilted">kilted</a></td>
19+
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/lyrical">lyrical</a></td>
2020
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/main">main</a></td>
2121
</tr>
2222
<tr>

0 commit comments

Comments
 (0)