Skip to content

Commit 8f2963a

Browse files
christophfroehlichchristophfroehlich
authored
Merge branch 'master' into remove/overloads
2 parents d7c04c2 + 20f9ea3 commit 8f2963a

35 files changed

+507
-116
lines changed

‎.github/mergify.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ pull_request_rules:
22

33
- name: Backport to humble at reviewers discretion
44
conditions:
5-
- base=ros2-master
5+
- base=master
66
- "label=backport-humble"
77
actions:
88
backport:
@@ -11,13 +11,22 @@ pull_request_rules:
1111

1212
- name: Backport to jazzy at reviewers discretion
1313
conditions:
14-
- base=ros2-master
14+
- base=master
1515
- "label=backport-jazzy"
1616
actions:
1717
backport:
1818
branches:
1919
- jazzy
2020

21+
- name: Backport to kilted at reviewers discretion
22+
conditions:
23+
- base=master
24+
- "label=backport-kilted"
25+
actions:
26+
backport:
27+
branches:
28+
- kilted
29+
2130
- name: Ask to resolve conflict
2231
conditions:
2332
- conflict
@@ -35,9 +44,9 @@ pull_request_rules:
3544
comment:
3645
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?
3746

38-
- name: development targets ros2-master branch
47+
- name: development targets master branch
3948
conditions:
40-
- base!=ros2-master
49+
- base!=master
4150
- author!=bmagyar
4251
- author!=destogl
4352
- author!=christophfroehlich
@@ -47,6 +56,6 @@ pull_request_rules:
4756
actions:
4857
comment:
4958
message: |
50-
@{{author}}, all pull requests must be targeted towards the `ros2-master` development branch.
51-
Once merged into `ros2-master`, it is possible to backport to `{{base}}`, but it must be in `ros2-master`
59+
@{{author}}, all pull requests must be targeted towards the `master` development branch.
60+
Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
5261
to have these changes reflected into new distributions.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- jazzy
7-
paths: &paths-filter
7+
paths:
88
- '**.hpp'
99
- '**.h'
1010
- '**.cpp'

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Kilted - ABI Compatibility Check
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- kilted
7+
paths:
8+
- '**.hpp'
9+
- '**.h'
10+
- '**.cpp'
11+
- '**.py'
12+
- '**.yaml'
13+
- '.github/workflows/kilted-abi-compatibility.yml'
14+
- '**/package.xml'
15+
- '**/CMakeLists.txt'
16+
- '**.xml'
17+
18+
concurrency:
19+
# cancel previous runs of the same workflow, except for pushes on given branches branch
20+
group: ${{ github.workflow }}-${{ github.ref }}
21+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
22+
23+
jobs:
24+
abi_check:
25+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@master
26+
with:
27+
ros_distro: kilted

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
2+
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)
3+
4+
name: Kilted - Binary Build
5+
on:
6+
pull_request: &event
7+
branches:
8+
- kilted
9+
paths:
10+
- '**.hpp'
11+
- '**.h'
12+
- '**.cpp'
13+
- '**.py'
14+
- '**.yaml'
15+
- '.github/workflows/kilted-binary-build.yml'
16+
- '**/package.xml'
17+
- '**/CMakeLists.txt'
18+
- 'control_toolbox-not-released.kilted.repos'
19+
- '**.xml'
20+
push: *event
21+
schedule:
22+
# Run every day to detect flakiness and broken dependencies
23+
- cron: '28 6 * * MON-FRI'
24+
25+
concurrency:
26+
# cancel previous runs of the same workflow, except for pushes on given branches branch
27+
group: ${{ github.workflow }}-${{ github.ref }}
28+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
29+
30+
jobs:
31+
binary:
32+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
33+
strategy:
34+
fail-fast: false
35+
matrix:
36+
ROS_REPO: [main, testing]
37+
with:
38+
ros_distro: kilted
39+
ros_repo: ${{ matrix.ROS_REPO }}
40+
upstream_workspace: control_toolbox-not-released.kilted.repos
41+
ref_for_scheduled_build: kilted
42+
binary_clang:
43+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
44+
with:
45+
ros_distro: kilted
46+
ros_repo: testing
47+
upstream_workspace: control_toolbox-not-released.kilted.repos
48+
ref_for_scheduled_build: kilted
49+
additional_debs: clang
50+
c_compiler: clang
51+
cxx_compiler: clang++
52+
not_test_build: true

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: Kilted - Coverage Build
2+
on:
3+
workflow_dispatch:
4+
pull_request: &event
5+
branches:
6+
- kilted
7+
paths:
8+
- '**.hpp'
9+
- '**.h'
10+
- '**.cpp'
11+
- '**.py'
12+
- '**.yaml'
13+
- '.github/workflows/kilted-build-coverage.yml'
14+
- '**/package.xml'
15+
- '**/CMakeLists.txt'
16+
- '**.xml'
17+
push: *event
18+
19+
concurrency:
20+
# cancel previous runs of the same workflow, except for pushes on given branches branch
21+
group: ${{ github.workflow }}-${{ github.ref }}
22+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
23+
24+
jobs:
25+
coverage:
26+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
27+
secrets: inherit
28+
with:
29+
ros_distro: kilted

‎.github/workflows/kilted-build-downstream.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
2+
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)
3+
4+
name: Kilted - Downstream Build
5+
on:
6+
pull_request:
7+
branches:
8+
- kilted
9+
paths:
10+
- '**.hpp'
11+
- '**.h'
12+
- '**.cpp'
13+
- '**.py'
14+
- '**.yaml'
15+
- '.github/workflows/kilted-build-downstream.yml'
16+
- '**/package.xml'
17+
- '**/CMakeLists.txt'
18+
- 'control_toolbox.kilted.repos'
19+
- 'ros_controls.kilted.repos'
20+
- '**.xml'
21+
22+
concurrency:
23+
# cancel previous runs of the same workflow, except for pushes on given branches branch
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
26+
27+
jobs:
28+
build-downstream:
29+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
30+
with:
31+
ros_distro: kilted
32+
ros_repo: testing
33+
ref_for_scheduled_build: kilted
34+
not_test_build: true
35+
upstream_workspace: control_toolbox.kilted.repos
36+
# we test the downstream packages, which are part of our organization
37+
downstream_workspace: ros_controls.kilted.repos
38+
not_test_downstream: false

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Kilted - Source Build
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- kilted
7+
paths:
8+
- '**.hpp'
9+
- '**.h'
10+
- '**.cpp'
11+
- '**.py'
12+
- '**.yaml'
13+
- '.github/workflows/kilted-build-source.yml'
14+
- '**/package.xml'
15+
- '**/CMakeLists.txt'
16+
- '**.xml'
17+
pull_request:
18+
branches:
19+
- kilted
20+
paths:
21+
- .github/workflows/kilted-build-source.yml
22+
schedule:
23+
# Run every day to detect flakiness and broken dependencies
24+
- cron: '03 3 * * MON-FRI'
25+
26+
concurrency:
27+
# cancel previous runs of the same workflow, except for pushes on given branches branch
28+
group: ${{ github.workflow }}-${{ github.ref }}
29+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
30+
31+
jobs:
32+
source_build:
33+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
34+
with:
35+
ros_distro: kilted
36+
ref: kilted
37+
container: ubuntu:24.04

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Kilted Check Docs
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches:
7+
- kilted
8+
paths:
9+
- '**.rst'
10+
- '**.md'
11+
- '**.jpg'
12+
- '**.jpeg'
13+
- '**.png'
14+
- '**.svg'
15+
- '**.yml'
16+
- '**.yaml'
17+
- '!.github/**' # exclude yaml files in .github directory
18+
- '.github/workflows/kilted-check-docs.yml'
19+
20+
concurrency:
21+
# cancel previous runs of the same workflow, except for pushes on given branches branch
22+
group: ${{ github.workflow }}-${{ github.ref }}
23+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
24+
25+
jobs:
26+
check-docs:
27+
name: Check Docs
28+
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@kilted
29+
with:
30+
CONTROL_TOOLBOX_PR: ${{ github.ref }}

‎.github/workflows/kilted-ci-pre-commit.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Kilted - Pre-Commit
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches:
7+
- kilted
8+
push:
9+
branches:
10+
- kilted
11+
12+
concurrency:
13+
# cancel previous runs of the same workflow, except for pushes on given branches branch
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
16+
17+
jobs:
18+
pre-commit:
19+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
20+
with:
21+
ros_distro: kilted

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Kilted - Debian Semi-Binary Build
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- kilted
7+
paths:
8+
- '**.hpp'
9+
- '**.h'
10+
- '**.cpp'
11+
- '**.py'
12+
- '**.yaml'
13+
- '.github/workflows/kilted-debian-build.yml'
14+
- '**/package.xml'
15+
- '**/CMakeLists.txt'
16+
- 'control_toolbox.kilted.repos'
17+
- '**.xml'
18+
schedule:
19+
# Run every day to detect flakiness and broken dependencies
20+
- cron: '03 5 * * MON-FRI'
21+
22+
concurrency:
23+
# cancel previous runs of the same workflow, except for pushes on given branches branch
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
26+
27+
jobs:
28+
debian_semi_binary_build:
29+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
30+
with:
31+
ros_distro: kilted
32+
upstream_workspace: control_toolbox.kilted.repos
33+
ref_for_scheduled_build: kilted

0 commit comments

Comments
 (0)