Skip to content

Commit 3657cd4

Browse files
authored
Changes for branching out for kilted (UniversalRobots#1662)
Creating a branch for kilted requires some information getting updated: * Update branch in README.md * Update badge and pipeline links in ci_status.md * Update workflows to only run on scheduled builds and with sources from the kilted branch I've also updated the kilted upstream workspace along the way.
1 parent 83aeea4 commit 3657cd4

8 files changed

Lines changed: 25 additions & 38 deletions

.github/mergify.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,14 @@ pull_request_rules:
2020
- jazzy
2121
labels:
2222
- jazzy
23+
24+
- name: Backport to kilted branch
25+
conditions:
26+
- base=main
27+
- label=backport-kilted
28+
actions:
29+
backport:
30+
branches:
31+
- kilted
32+
labels:
33+
- kilted
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
name: Kilted 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,4 +11,4 @@ jobs:
1711
with:
1812
ros_distro: kilted
1913
ros_repo: main
20-
ref_for_scheduled_build: main
14+
ref_for_scheduled_build: kilted
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
name: Kilted 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,4 +11,4 @@ jobs:
1711
with:
1812
ros_distro: kilted
1913
ros_repo: testing
20-
ref_for_scheduled_build: main
14+
ref_for_scheduled_build: kilted
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
name: Kilted 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,4 +12,4 @@ jobs:
1812
ros_distro: kilted
1913
ros_repo: main
2014
upstream_workspace: Universal_Robots_ROS2_Driver.kilted.repos
21-
ref_for_scheduled_build: main
15+
ref_for_scheduled_build: kilted
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
name: Kilted 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,4 +12,4 @@ jobs:
1812
ros_distro: kilted
1913
ros_repo: testing
2014
upstream_workspace: Universal_Robots_ROS2_Driver.kilted.repos
21-
ref_for_scheduled_build: main
15+
ref_for_scheduled_build: kilted

README.md

Lines changed: 1 addition & 1 deletion
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/humble">humble</a></td>
2929
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/jazzy">jazzy</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/main">kilted</a></td>
3131
<td><a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/tree/main">main</a></td>
3232
</tr>
3333
<tr>

Universal_Robots_ROS2_Driver.kilted.repos

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ repositories:
1414
ros2_control:
1515
type: git
1616
url: https://github.com/ros-controls/ros2_control.git
17-
version: master
17+
version: kilted
1818
ros2_controllers:
1919
type: git
2020
url: https://github.com/ros-controls/ros2_controllers
21-
version: master
21+
version: kilted
2222
kinematics_interface:
2323
type: git
2424
url: https://github.com/ros-controls/kinematics_interface.git
@@ -34,7 +34,7 @@ repositories:
3434
realtime_tools:
3535
type: git
3636
url: https://github.com/ros-controls/realtime_tools.git
37-
version: master
37+
version: kilted
3838
moveit2:
3939
type: git
4040
url: https://github.com/moveit/moveit2.git

ci_status.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ red pipeline there should be a corresponding issue labeled with [ci-failure](htt
4747
</a> <br />
4848
</td>
4949
<td> <!-- kilted -->
50-
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-binary-main.yml?query=branch%3Amain+">
51-
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-binary-main.yml/badge.svg?branch=main"
50+
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-binary-main.yml?query=event%3Aschedule+">
51+
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-binary-main.yml/badge.svg?event=schedule"
5252
alt="Kilted Binary Main"/>
5353
</a> <br />
54-
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-binary-testing.yml?query=branch%3Amain+">
55-
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-binary-testing.yml/badge.svg?branch=main"
54+
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-binary-testing.yml?query=event%3Aschedule+">
55+
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-binary-testing.yml/badge.svg?event=schedule"
5656
alt="Kilted Binary Testing"/>
5757
</a> <br />
58-
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-semi-binary-main.yml?query=branch%3Amain+">
59-
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-semi-binary-main.yml/badge.svg?branch=main"
58+
<a href="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-semi-binary-main.yml?query=event%3Aschedule+">
59+
<img src="https://github.com/UniversalRobots/Universal_Robots_ROS2_Driver/actions/workflows/kilted-semi-binary-main.yml/badge.svg?event=schedule"
6060
alt="Kilted Semi-Binary Main"/>
6161
</a> <br />
6262
</td>

0 commit comments

Comments
 (0)