Skip to content

Commit dd64226

Browse files
wittenatorwittenator
authored
Merge branch 'ros-controls:master' into master
2 parents 3f64a4d + 56c6fa0 commit dd64226

File tree

164 files changed

+1855
-1433
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+1855
-1433
lines changed

‎.github/dependabot.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,17 @@ updates:
1818
schedule:
1919
interval: "weekly"
2020
target-branch: "humble"
21+
- package-ecosystem: "github-actions"
22+
# Workflow files stored in the
23+
# default location of `.github/workflows`
24+
directory: "/"
25+
schedule:
26+
interval: "weekly"
27+
target-branch: "jazzy"
28+
- package-ecosystem: "github-actions"
29+
# Workflow files stored in the
30+
# default location of `.github/workflows`
31+
directory: "/"
32+
schedule:
33+
interval: "weekly"
34+
target-branch: "kilted"

‎.github/mergify.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@ pull_request_rules:
1717
branches:
1818
- jazzy
1919

20+
- name: Backport to kilted at reviewers discretion
21+
conditions:
22+
- base=master
23+
- "label=backport-kilted"
24+
actions:
25+
backport:
26+
branches:
27+
- kilted
28+
2029
- name: Ask to resolve conflict
2130
conditions:
2231
- conflict

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,7 @@ name: Humble Binary Build
44

55
on:
66
workflow_dispatch:
7-
pull_request:
8-
branches:
9-
- humble
10-
paths:
11-
- '**.hpp'
12-
- '**.h'
13-
- '**.cpp'
14-
- '**.py'
15-
- '**.yaml'
16-
- '.github/workflows/humble-binary-build.yml'
17-
- '**/package.xml'
18-
- '**/CMakeLists.txt'
19-
- 'ros2_controllers-not-released.humble.repos'
20-
- '**.xml'
21-
push:
7+
pull_request: &event
228
branches:
239
- humble
2410
paths:
@@ -32,6 +18,7 @@ on:
3218
- '**/CMakeLists.txt'
3319
- 'ros2_controllers-not-released.humble.repos'
3420
- '**.xml'
21+
push: *event
3522
schedule:
3623
# Run every morning to detect flakiness and broken dependencies
3724
- cron: '03 1 * * MON-FRI'

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
11
name: Coverage Build - Humble
22
on:
33
workflow_dispatch:
4-
push:
5-
branches:
6-
- humble
7-
paths:
8-
- '**.hpp'
9-
- '**.h'
10-
- '**.cpp'
11-
- '**.py'
12-
- '**.yaml'
13-
- '.github/workflows/humble-coverage-build.yml'
14-
- 'codecov.yml'
15-
- '**/package.xml'
16-
- '**/CMakeLists.txt'
17-
- 'ros2_controllers.humble.repos'
18-
- '**.xml'
19-
pull_request:
4+
pull_request: &event
205
branches:
216
- humble
227
paths:
@@ -31,6 +16,7 @@ on:
3116
- '**/CMakeLists.txt'
3217
- 'ros2_controllers.humble.repos'
3318
- '**.xml'
19+
push: *event
3420

3521
concurrency:
3622
# cancel previous runs of the same workflow, except for pushes on given branches

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,7 @@ name: Humble Semi-Binary Build
33

44
on:
55
workflow_dispatch:
6-
pull_request:
7-
branches:
8-
- humble
9-
paths:
10-
- '**.hpp'
11-
- '**.h'
12-
- '**.cpp'
13-
- '**.py'
14-
- '**.yaml'
15-
- '.github/workflows/humble-semi-binary-build.yml'
16-
- '**/package.xml'
17-
- '**/CMakeLists.txt'
18-
- 'ros2_controllers.humble.repos'
19-
- '**.xml'
20-
push:
6+
pull_request: &event
217
branches:
228
- humble
239
paths:
@@ -31,6 +17,7 @@ on:
3117
- '**/CMakeLists.txt'
3218
- 'ros2_controllers.humble.repos'
3319
- '**.xml'
20+
push: *event
3421
schedule:
3522
# Run every morning to detect flakiness and broken dependencies
3623
- cron: '33 1 * * MON-FRI'

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Jazzy Binary Build
44

55
on:
66
workflow_dispatch:
7-
pull_request:
7+
pull_request: &event
88
branches:
99
- jazzy
1010
- '*feature*'
@@ -20,19 +20,7 @@ on:
2020
- '**/CMakeLists.txt'
2121
- 'ros2_controllers-not-released.jazzy.repos'
2222
- '**.xml'
23-
push:
24-
branches:
25-
- jazzy
26-
paths:
27-
- '**.hpp'
28-
- '**.h'
29-
- '**.cpp'
30-
- '**.yaml'
31-
- '.github/workflows/jazzy-binary-build.yml'
32-
- '**/package.xml'
33-
- '**/CMakeLists.txt'
34-
- 'ros2_controllers-not-released.jazzy.repos'
35-
- '**.xml'
23+
push: *event
3624
schedule:
3725
# Run every morning to detect flakiness and broken dependencies
3826
- cron: '03 1 * * MON-FRI'

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
11
name: Coverage Build - Jazzy
22
on:
33
workflow_dispatch:
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:
4+
pull_request: &event
205
branches:
216
- jazzy
227
paths:
@@ -31,6 +16,7 @@ on:
3116
- '**/package.xml'
3217
- '**/CMakeLists.txt'
3318
- 'ros2_controllers.jazzy.repos'
19+
push: *event
3420

3521
concurrency:
3622
# cancel previous runs of the same workflow, except for pushes on given branches

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

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Jazzy Semi-Binary Build
33

44
on:
55
workflow_dispatch:
6-
pull_request:
6+
pull_request: &event
77
branches:
88
- jazzy
99
- '*feature*'
@@ -19,20 +19,7 @@ on:
1919
- '**/CMakeLists.txt'
2020
- 'ros2_controllers.jazzy.repos'
2121
- '**.xml'
22-
push:
23-
branches:
24-
- jazzy
25-
paths:
26-
- '**.hpp'
27-
- '**.h'
28-
- '**.cpp'
29-
- '**.py'
30-
- '**.yaml'
31-
- '.github/workflows/jazzy-semi-binary-build.yml'
32-
- '**/package.xml'
33-
- '**/CMakeLists.txt'
34-
- 'ros2_controllers.jazzy.repos'
35-
- '**.xml'
22+
push: *event
3623
schedule:
3724
# Run every morning to detect flakiness and broken dependencies
3825
- cron: '33 1 * * MON-FRI'

‎.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+
- '**.yaml'
12+
- '.github/workflows/kilted-abi-compatibility.yml'
13+
- '**/package.xml'
14+
- '**/CMakeLists.txt'
15+
- 'ros2_controllers-not-released.kilted.repos'
16+
- '**.xml'
17+
18+
concurrency:
19+
# cancel previous runs of the same workflow, except for pushes on given branches
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: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Kilted Binary Build
2+
# author: Denis Štogl <[email protected]>
3+
# description: 'Build & test all dependencies from released (binary) packages.'
4+
5+
on:
6+
workflow_dispatch:
7+
pull_request: &event
8+
branches:
9+
- kilted
10+
- '*feature*'
11+
- '*feature/**'
12+
paths:
13+
- '**.hpp'
14+
- '**.h'
15+
- '**.cpp'
16+
- '**.py'
17+
- '**.yaml'
18+
- '.github/workflows/kilted-binary-build.yml'
19+
- '**/package.xml'
20+
- '**/CMakeLists.txt'
21+
- 'ros2_controllers-not-released.kilted.repos'
22+
- '**.xml'
23+
push: *event
24+
schedule:
25+
# Run every morning to detect flakiness and broken dependencies
26+
- cron: '03 1 * * MON-FRI'
27+
28+
concurrency:
29+
# cancel previous runs of the same workflow, except for pushes on given branches
30+
group: ${{ github.workflow }}-${{ github.ref }}
31+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
32+
33+
jobs:
34+
binary:
35+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
36+
strategy:
37+
fail-fast: false
38+
matrix:
39+
ROS_REPO: [main, testing]
40+
with:
41+
ros_distro: kilted
42+
ros_repo: ${{ matrix.ROS_REPO }}
43+
upstream_workspace: ros2_controllers-not-released.kilted.repos
44+
ref_for_scheduled_build: kilted

0 commit comments

Comments
 (0)