Skip to content

Commit 5090d28

Browse files
mergify[bot]mergify[bot]
authored
Add Kilted Kaiju and branch for Jazzy (backport #1646) (#1678)
1 parent 66d76c6 commit 5090d28

27 files changed

+217
-78
lines changed

‎.github/mergify.yml

+9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
pull_request_rules:
22

3+
- name: Backport to jazzy at reviewers discretion
4+
conditions:
5+
- base=master
6+
- "label=backport-jazzy"
7+
actions:
8+
backport:
9+
branches:
10+
- jazzy
11+
312
- name: Ask to resolve conflict
413
conditions:
514
- conflict

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

-1
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,4 @@ jobs:
2525
with:
2626
ros_distro: humble
2727
ref: humble
28-
ros2_repo_branch: humble
2928
os_name: ubuntu-22.04

‎.github/workflows/jazzy-abi-compatibility.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
pull_request:
55
branches:
6-
- master
6+
- jazzy
77
paths:
88
- '**.hpp'
99
- '**.h'
@@ -16,7 +16,7 @@ on:
1616
- '**.xml'
1717

1818
concurrency:
19-
# cancel previous runs of the same workflow, except for pushes on master branch
19+
# cancel previous runs of the same workflow, except for pushes on jazzy branch
2020
group: ${{ github.workflow }}-${{ github.ref }}
2121
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
2222

‎.github/workflows/jazzy-binary-build.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
workflow_dispatch:
77
pull_request:
88
branches:
9-
- master
9+
- jazzy
1010
- '*feature*'
1111
- '*feature/**'
1212
paths:
@@ -22,7 +22,7 @@ on:
2222
- '**.xml'
2323
push:
2424
branches:
25-
- master
25+
- jazzy
2626
paths:
2727
- '**.hpp'
2828
- '**.h'
@@ -38,7 +38,7 @@ on:
3838
- cron: '03 1 * * *'
3939

4040
concurrency:
41-
# cancel previous runs of the same workflow, except for pushes on master branch
41+
# cancel previous runs of the same workflow, except for pushes on jazzy branch
4242
group: ${{ github.workflow }}-${{ github.ref }}
4343
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
4444

@@ -53,4 +53,4 @@ jobs:
5353
ros_distro: jazzy
5454
ros_repo: ${{ matrix.ROS_REPO }}
5555
upstream_workspace: ros2_controllers-not-released.jazzy.repos
56-
ref_for_scheduled_build: master
56+
ref_for_scheduled_build: jazzy

‎.github/workflows/jazzy-check-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
pull_request:
66
branches:
7-
- master
7+
- jazzy
88
paths:
99
- '**.rst'
1010
- '**.md'

‎.github/workflows/jazzy-coverage-build.yml

+31-32
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,39 @@
11
name: Coverage Build - Jazzy
22
on:
33
workflow_dispatch:
4-
# TODO(anyone) activate when branched for Jazzy
5-
# push:
6-
# branches:
7-
# - master
8-
# paths:
9-
# - '**.hpp'
10-
# - '**.h'
11-
# - '**.cpp'
12-
# - '.github/workflows/jazzy-coverage-build.yml'
13-
# - '**.yaml'
14-
# - '**/package.xml'
15-
# - '**/CMakeLists.txt'
16-
# - 'codecov.yml'
17-
# - '**/package.xml'
18-
# - '**/CMakeLists.txt'
19-
# - 'ros2_controllers.jazzy.repos'
20-
# pull_request:
21-
# branches:
22-
# - master
23-
# paths:
24-
# - '**.hpp'
25-
# - '**.h'
26-
# - '**.cpp'
27-
# - '.github/workflows/jazzy-coverage-build.yml'
28-
# - '**.yaml'
29-
# - '**/package.xml'
30-
# - '**/CMakeLists.txt'
31-
# - 'codecov.yml'
32-
# - '**/package.xml'
33-
# - '**/CMakeLists.txt'
34-
# - 'ros2_controllers.jazzy.repos'
4+
push:
5+
branches:
6+
- jazzy
7+
paths:
8+
- '**.hpp'
9+
- '**.h'
10+
- '**.cpp'
11+
- '.github/workflows/jazzy-coverage-build.yml'
12+
- '**.yaml'
13+
- '**/package.xml'
14+
- '**/CMakeLists.txt'
15+
- 'codecov.yml'
16+
- '**/package.xml'
17+
- '**/CMakeLists.txt'
18+
- 'ros2_controllers.jazzy.repos'
19+
pull_request:
20+
branches:
21+
- jazzy
22+
paths:
23+
- '**.hpp'
24+
- '**.h'
25+
- '**.cpp'
26+
- '.github/workflows/jazzy-coverage-build.yml'
27+
- '**.yaml'
28+
- '**/package.xml'
29+
- '**/CMakeLists.txt'
30+
- 'codecov.yml'
31+
- '**/package.xml'
32+
- '**/CMakeLists.txt'
33+
- 'ros2_controllers.jazzy.repos'
3534

3635
concurrency:
37-
# cancel previous runs of the same workflow, except for pushes on master branch
36+
# cancel previous runs of the same workflow, except for pushes on jazzy branch
3837
group: ${{ github.workflow }}-${{ github.ref }}
3938
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
4039

‎.github/workflows/jazzy-debian-build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
pull_request:
55
branches:
6-
- master
6+
- jazzy
77
paths:
88
- '**.hpp'
99
- '**.h'
@@ -20,7 +20,7 @@ on:
2020
- cron: '03 1 * * *'
2121

2222
concurrency:
23-
# cancel previous runs of the same workflow, except for pushes on master branch
23+
# cancel previous runs of the same workflow, except for pushes on jazzy branch
2424
group: ${{ github.workflow }}-${{ github.ref }}
2525
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
2626

@@ -31,5 +31,5 @@ jobs:
3131
with:
3232
ros_distro: jazzy
3333
upstream_workspace: ros2_controllers.jazzy.repos
34-
ref_for_scheduled_build: master
34+
ref_for_scheduled_build: jazzy
3535
skip_packages: rqt_joint_trajectory_controller

‎.github/workflows/jazzy-pre-commit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
pull_request:
66
branches:
7-
- master
7+
- jazzy
88

99
concurrency:
1010
group: ${{ github.workflow }}-${{ github.ref }}

‎.github/workflows/jazzy-rhel-semi-binary-build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
pull_request:
55
branches:
6-
- master
6+
- jazzy
77
paths:
88
- '**.hpp'
99
- '**.h'
@@ -20,7 +20,7 @@ on:
2020
- cron: '03 1 * * *'
2121

2222
concurrency:
23-
# cancel previous runs of the same workflow, except for pushes on master branch
23+
# cancel previous runs of the same workflow, except for pushes on jazzy branch
2424
group: ${{ github.workflow }}-${{ github.ref }}
2525
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
2626

@@ -30,5 +30,5 @@ jobs:
3030
with:
3131
ros_distro: jazzy
3232
upstream_workspace: ros2_controllers.jazzy.repos
33-
ref_for_scheduled_build: master
33+
ref_for_scheduled_build: jazzy
3434
skip_packages: rqt_joint_trajectory_controller

‎.github/workflows/jazzy-semi-binary-build.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
workflow_dispatch:
66
pull_request:
77
branches:
8-
- master
8+
- jazzy
99
- '*feature*'
1010
- '*feature/**'
1111
paths:
@@ -21,7 +21,7 @@ on:
2121
- '**.xml'
2222
push:
2323
branches:
24-
- master
24+
- jazzy
2525
paths:
2626
- '**.hpp'
2727
- '**.h'
@@ -38,7 +38,7 @@ on:
3838
- cron: '33 1 * * *'
3939

4040
concurrency:
41-
# cancel previous runs of the same workflow, except for pushes on master branch
41+
# cancel previous runs of the same workflow, except for pushes on jazzy branch
4242
group: ${{ github.workflow }}-${{ github.ref }}
4343
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
4444

@@ -49,14 +49,14 @@ jobs:
4949
ros_distro: jazzy
5050
ros_repo: testing
5151
upstream_workspace: ros2_controllers.jazzy.repos
52-
ref_for_scheduled_build: master
52+
ref_for_scheduled_build: jazzy
5353
semi_binary_clang:
5454
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
5555
with:
5656
ros_distro: jazzy
5757
ros_repo: testing
5858
upstream_workspace: ros2_controllers.jazzy.repos
59-
ref_for_scheduled_build: master
59+
ref_for_scheduled_build: jazzy
6060
additional_debs: clang
6161
c_compiler: clang
6262
cxx_compiler: clang++

‎.github/workflows/jazzy-semi-binary-downstream-build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
workflow_dispatch:
77
pull_request:
88
branches:
9-
- master
9+
- jazzy
1010
paths:
1111
- '**.hpp'
1212
- '**.h'
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
ros_distro: jazzy
3131
ros_repo: testing
32-
ref_for_scheduled_build: master
32+
ref_for_scheduled_build: jazzy
3333
upstream_workspace: ros2_controllers.jazzy.repos
3434
# we don't test this repository, we just build it
3535
not_test_build: true
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
ros_distro: jazzy
4343
ros_repo: testing
44-
ref_for_scheduled_build: master
44+
ref_for_scheduled_build: jazzy
4545
upstream_workspace: ros2_controllers.jazzy.repos
4646
# we don't test this repository, we just build it
4747
not_test_build: true

‎.github/workflows/jazzy-source-build.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_dispatch:
44
push:
55
branches:
6-
- master
6+
- jazzy
77
paths:
88
- '**.hpp'
99
- '**.h'
@@ -24,6 +24,5 @@ jobs:
2424
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
2525
with:
2626
ros_distro: jazzy
27-
ref: master
28-
ros2_repo_branch: jazzy
27+
ref: jazzy
2928
container: ubuntu:24.04

‎.github/workflows/rolling-abi-compatibility.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
- '**/package.xml'
1414
- '**/CMakeLists.txt'
1515
- 'ros2_controllers-not-released.rolling.repos'
16+
- 'ros2_controllers-not-released.kilted.repos'
1617
- '**.xml'
1718

1819
concurrency:
@@ -23,5 +24,9 @@ concurrency:
2324
jobs:
2425
abi_check:
2526
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@master
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
ROS_DISTRO: [kilted, rolling]
2631
with:
27-
ros_distro: rolling
32+
ros_distro: ${{ matrix.ROS_DISTRO }}

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ on:
1919
- '**/package.xml'
2020
- '**/CMakeLists.txt'
2121
- 'ros2_controllers-not-released.rolling.repos'
22+
- 'ros2_controllers-not-released.kilted.repos'
2223
- '**.xml'
2324
push:
2425
branches:
@@ -33,6 +34,7 @@ on:
3334
- '**/package.xml'
3435
- '**/CMakeLists.txt'
3536
- 'ros2_controllers-not-released.rolling.repos'
37+
- 'ros2_controllers-not-released.kilted.repos'
3638
- '**.xml'
3739
schedule:
3840
# Run every morning to detect flakiness and broken dependencies
@@ -49,9 +51,10 @@ jobs:
4951
strategy:
5052
fail-fast: false
5153
matrix:
54+
ROS_DISTRO: [kilted, rolling]
5255
ROS_REPO: [main, testing]
5356
with:
54-
ros_distro: rolling
57+
ros_distro: ${{ matrix.ROS_DISTRO }}
5558
ros_repo: ${{ matrix.ROS_REPO }}
56-
upstream_workspace: ros2_controllers-not-released.rolling.repos
59+
upstream_workspace: ros2_controllers-not-released.${{ matrix.ROS_DISTRO }}.repos
5760
ref_for_scheduled_build: master

‎.github/workflows/rolling-compatibility-kilted-binary-build.yml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Check Rolling Compatibility on Kilted
2+
# author: Christoph Froehlich <christoph.froehlich@ait.ac.at>
3+
# description: 'Build & test the rolling version on Kilted distro.'
4+
5+
on:
6+
workflow_dispatch:
7+
pull_request:
8+
branches:
9+
- master
10+
- '*feature*'
11+
- '*feature/**'
12+
paths:
13+
- '**.hpp'
14+
- '**.h'
15+
- '**.cpp'
16+
- '**.py'
17+
- '**.yaml'
18+
- '.github/workflows/rolling-compatibility-kilted-binary-build.yml'
19+
- '**/package.xml'
20+
- '**/CMakeLists.txt'
21+
- 'ros2_controllers.rolling.repos'
22+
- '**.xml'
23+
push:
24+
branches:
25+
- master
26+
paths:
27+
- '**.hpp'
28+
- '**.h'
29+
- '**.cpp'
30+
- '**.py'
31+
- '**.yaml'
32+
- '.github/workflows/rolling-compatibility-kilted-binary-build.yml'
33+
- '**/package.xml'
34+
- '**/CMakeLists.txt'
35+
- 'ros2_controllers.rolling.repos'
36+
- '**.xml'
37+
38+
concurrency:
39+
# cancel previous runs of the same workflow, except for pushes on master branch
40+
group: ${{ github.workflow }}-${{ github.ref }}
41+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
42+
43+
jobs:
44+
build-on-kilted:
45+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
46+
with:
47+
ros_distro: kilted
48+
ros_repo: testing
49+
upstream_workspace: ros2_controllers.rolling.repos
50+
ref_for_scheduled_build: master

0 commit comments

Comments
 (0)