Skip to content

Commit 2c6d7a6

Browse files
authored
Add iron branch (#814)
1 parent f81a82c commit 2c6d7a6

10 files changed

+101
-49
lines changed

.github/mergify.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,16 @@ pull_request_rules:
88
branches:
99
- humble
1010

11+
12+
- name: Backport to iron at reviewers discretion
13+
conditions:
14+
- base=master
15+
- "label=backport-iron"
16+
actions:
17+
backport:
18+
branches:
19+
- iron
20+
1121
- name: Ask to resolve conflict
1222
conditions:
1323
- conflict
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: Humble - ABI Compatibility Check
1+
name: Iron - ABI Compatibility Check
22
on:
33
workflow_dispatch:
44
branches:
5-
- humble
5+
- iron
66
pull_request:
77
branches:
8-
- humble
8+
- iron
99

1010
jobs:
1111
abi_check:
@@ -14,7 +14,7 @@ jobs:
1414
- uses: actions/checkout@v4
1515
- uses: ros-industrial/industrial_ci@master
1616
env:
17-
ROS_DISTRO: humble
17+
ROS_DISTRO: iron
1818
ROS_REPO: main
1919
ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
2020
NOT_TEST_BUILD: true
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
name: Humble Binary Build - main
1+
name: Iron Binary Build - main
22
# author: Denis Štogl <[email protected]>
33
# description: 'Build & test all dependencies from released (binary) packages.'
44

55
on:
66
workflow_dispatch:
77
branches:
8-
- humble
8+
- iron
9+
- '*feature*'
10+
- '*feature/**'
911
pull_request:
1012
branches:
11-
- humble
13+
- iron
14+
- '*feature*'
15+
- '*feature/**'
1216
push:
1317
branches:
14-
- humble
18+
- iron
1519
schedule:
1620
# Run every morning to detect flakiness and broken dependencies
1721
- cron: '03 1 * * *'
@@ -20,7 +24,7 @@ jobs:
2024
binary:
2125
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
2226
with:
23-
ros_distro: humble
27+
ros_distro: iron
2428
ros_repo: main
25-
upstream_workspace: ros2_controllers-not-released.humble.repos
26-
ref_for_scheduled_build: humble
29+
upstream_workspace: ros2_controllers-not-released.iron.repos
30+
ref_for_scheduled_build: iron
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
name: Humble Binary Build - testing
1+
name: Iron Binary Build - testing
22
# author: Denis Štogl <[email protected]>
33
# description: 'Build & test all dependencies from released (binary) packages.'
44

55
on:
66
workflow_dispatch:
77
branches:
8-
- humble
8+
- iron
9+
- '*feature*'
10+
- '*feature/**'
911
pull_request:
1012
branches:
11-
- humble
13+
- iron
14+
- '*feature*'
15+
- '*feature/**'
1216
push:
1317
branches:
14-
- humble
18+
- iron
1519
schedule:
1620
# Run every morning to detect flakiness and broken dependencies
1721
- cron: '03 1 * * *'
@@ -20,7 +24,7 @@ jobs:
2024
binary:
2125
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
2226
with:
23-
ros_distro: humble
27+
ros_distro: iron
2428
ros_repo: testing
25-
upstream_workspace: ros2_controllers-not-released.humble.repos
26-
ref_for_scheduled_build: humble
29+
upstream_workspace: ros2_controllers-not-released.iron.repos
30+
ref_for_scheduled_build: iron

.github/workflows/humble-rhel-binary-build.yml renamed to .github/workflows/iron-rhel-binary-build.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
1-
name: Humble RHEL Binary Build
1+
name: Iron RHEL Binary Build
22
on:
33
workflow_dispatch:
4-
branches:
5-
- humble
6-
pull_request:
7-
branches:
8-
- humble
94
push:
105
branches:
11-
- humble
6+
- iron
127
schedule:
138
# Run every day to detect flakiness and broken dependencies
149
- cron: '03 1 * * *'
1510

1611

1712
jobs:
18-
humble_rhel_binary:
19-
name: Humble RHEL binary build
13+
iron_rhel_binary:
14+
name: Iron RHEL binary build
2015
runs-on: ubuntu-latest
2116
env:
22-
ROS_DISTRO: humble
23-
container: ghcr.io/ros-controls/ros:humble-rhel
17+
ROS_DISTRO: iron
18+
container: ghcr.io/ros-controls/ros:iron-rhel
2419
steps:
2520
- uses: actions/checkout@v4
2621
with:
Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
name: Humble Semi-Binary Build - main
1+
name: Iron Semi-Binary Build - main
22
# description: 'Build & test that compiles the main dependencies from source.'
33

44
on:
55
workflow_dispatch:
66
branches:
7-
- humble
7+
- iron
8+
- '*feature*'
9+
- '*feature/**'
810
pull_request:
911
branches:
10-
- humble
12+
- iron
13+
- '*feature*'
14+
- '*feature/**'
1115
push:
1216
branches:
13-
- humble
17+
- iron
1418
schedule:
1519
# Run every morning to detect flakiness and broken dependencies
1620
- cron: '33 1 * * *'
@@ -19,7 +23,7 @@ jobs:
1923
semi_binary:
2024
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
2125
with:
22-
ros_distro: humble
26+
ros_distro: iron
2327
ros_repo: main
24-
upstream_workspace: ros2_controllers.humble.repos
25-
ref_for_scheduled_build: humble
28+
upstream_workspace: ros2_controllers.iron.repos
29+
ref_for_scheduled_build: iron
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
name: Humble Semi-Binary Build - testing
1+
name: Iron Semi-Binary Build - testing
22
# description: 'Build & test that compiles the main dependencies from source.'
33

44
on:
55
workflow_dispatch:
66
branches:
7-
- humble
7+
- iron
8+
- '*feature*'
9+
- '*feature/**'
810
pull_request:
911
branches:
10-
- humble
12+
- iron
13+
- '*feature*'
14+
- '*feature/**'
1115
push:
1216
branches:
13-
- humble
17+
- iron
1418
schedule:
1519
# Run every morning to detect flakiness and broken dependencies
1620
- cron: '33 1 * * *'
@@ -19,7 +23,7 @@ jobs:
1923
semi_binary:
2024
uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml
2125
with:
22-
ros_distro: humble
26+
ros_distro: iron
2327
ros_repo: testing
24-
upstream_workspace: ros2_controllers.humble.repos
25-
ref_for_scheduled_build: humble
28+
upstream_workspace: ros2_controllers.iron.repos
29+
ref_for_scheduled_build: iron
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: Humble Source Build
1+
name: Iron Source Build
22
on:
33
workflow_dispatch:
44
branches:
5-
- humble
5+
- iron
66
push:
77
branches:
8-
- humble
8+
- iron
99
schedule:
1010
# Run every day to detect flakiness and broken dependencies
1111
- cron: '03 3 * * *'
@@ -14,6 +14,6 @@ jobs:
1414
source:
1515
uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
1616
with:
17-
ros_distro: humble
18-
ref: humble
19-
ros2_repo_branch: humble
17+
ros_distro: iron
18+
ref: iron
19+
ros2_repo_branch: iron

.github/workflows/prerelease-check.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ on:
1010
type: choice
1111
options:
1212
- humble
13+
- iron
1314
- rolling
1415
branch:
1516
description: 'Chose branch for distro'
@@ -18,6 +19,7 @@ on:
1819
type: choice
1920
options:
2021
- humble
22+
- iron
2123
- master
2224

2325
jobs:

ros2_controllers.iron.repos

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
repositories:
2+
ros2_control:
3+
type: git
4+
url: https://github.com/ros-controls/ros2_control.git
5+
version: iron
6+
realtime_tools:
7+
type: git
8+
url: https://github.com/ros-controls/realtime_tools.git
9+
version: master
10+
control_msgs:
11+
type: git
12+
url: https://github.com/ros-controls/control_msgs.git
13+
version: master
14+
control_toolbox:
15+
type: git
16+
url: https://github.com/ros-controls/control_toolbox.git
17+
version: ros2-master
18+
kinematics_interface:
19+
type: git
20+
url: https://github.com/ros-controls/kinematics_interface.git
21+
version: master
22+
angles:
23+
type: git
24+
url: https://github.com/ros/angles.git
25+
version: ros2
26+
generate_parameter_library:
27+
type: git
28+
url: https://github.com/picknikrobotics/generate_parameter_library.git
29+
version: main

0 commit comments

Comments
 (0)