Skip to content

Commit 5150733

Browse files
authored
Merge branch 'master' into feat/issue-759-reup
2 parents 5d603c5 + c993e5b commit 5150733

File tree

140 files changed

+3413
-1096
lines changed

Some content is hidden

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

140 files changed

+3413
-1096
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,10 @@ updates:
2525
schedule:
2626
interval: "weekly"
2727
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 & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +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-
- '.github/workflows/humble-binary-build.yml'
16-
- '**/package.xml'
17-
- '**/CMakeLists.txt'
18-
- 'ros2_control-not-released.humble.repos'
19-
push:
7+
pull_request: &event
208
branches:
219
- humble
2210
paths:
@@ -28,6 +16,7 @@ on:
2816
- '**/package.xml'
2917
- '**/CMakeLists.txt'
3018
- 'ros2_control-not-released.humble.repos'
19+
push: *event
3120
schedule:
3221
# Run every morning to detect flakiness and broken dependencies
3322
- cron: '03 1 * * MON-FRI'

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +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-
- '.github/workflows/humble-coverage-build.yml'
13-
- '**/package.xml'
14-
- '**/CMakeLists.txt'
15-
- 'ros2_control.humble.repos'
16-
- 'codecov.yml'
17-
pull_request:
4+
pull_request: &event
185
branches:
196
- humble
207
paths:
@@ -27,6 +14,7 @@ on:
2714
- '**/CMakeLists.txt'
2815
- 'ros2_control.humble.repos'
2916
- 'codecov.yml'
17+
push: *event
3018

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

.github/workflows/humble-pre-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ jobs:
2525
ros_distro: humble
2626
# downstream_depth is not set on pull_request event
2727
prerelease_downstream_depth: ${{ github.event_name == 'pull_request' && '0' || inputs.downstream_depth }}
28+
prerelease_exclude_pkg: ackermann_steering_controller admittance_controller bicycle_steering_controller chained_filter_controller diff_drive_controller effort_controllers force_torque_sensor_broadcaster forward_command_controller gpio_controllers gps_sensor_broadcaster imu_sensor_broadcaster joint_state_broadcaster joint_trajectory_controller mecanum_drive_controller motion_primitives_controllers omni_wheel_drive_controller parallel_gripper_controller pid_controller pose_broadcaster position_controllers range_sensor_broadcaster ros2_controllers ros2_controllers_test_nodes rqt_joint_trajectory_controller steering_controllers_library tricycle_controller tricycle_steering_controller velocity_controllers gz_ros2_control gz_ros2_control_demos gz_ros2_control_tests

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,7 @@ name: Humble Semi-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-
- '.github/workflows/humble-semi-binary-build.yml'
16-
- '**/package.xml'
17-
- '**/CMakeLists.txt'
18-
- 'ros2_control.humble.repos'
19-
push:
7+
pull_request: &event
208
branches:
219
- humble
2210
paths:
@@ -28,6 +16,7 @@ on:
2816
- '**/package.xml'
2917
- '**/CMakeLists.txt'
3018
- 'ros2_control.humble.repos'
19+
push: *event
3120
schedule:
3221
# Run every morning to detect flakiness and broken dependencies
3322
- cron: '03 1 * * MON-FRI'

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ on:
1313
- '**/package.xml'
1414
- '**/CMakeLists.txt'
1515
- 'ros2_control.humble.repos'
16+
pull_request:
17+
branches:
18+
- humble
19+
paths:
20+
- .github/workflows/humble-source-build.yml
1621
schedule:
1722
# Run every day to detect flakiness and broken dependencies
1823
- cron: '03 3 * * MON-FRI'
@@ -23,4 +28,4 @@ jobs:
2328
with:
2429
ros_distro: humble
2530
ref: humble
26-
os_name: ubuntu-22.04
31+
container: ubuntu:22.04

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

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

55
on:
66
workflow_dispatch:
7-
pull_request:
8-
branches:
9-
- jazzy
10-
paths:
11-
- '**.hpp'
12-
- '**.h'
13-
- '**.cpp'
14-
- '**.py'
15-
- '.github/workflows/jazzy-binary-build.yml'
16-
- '**/package.xml'
17-
- '**/CMakeLists.txt'
18-
- 'ros2_control-not-released.jazzy.repos'
19-
push:
7+
pull_request: &event
208
branches:
219
- jazzy
2210
paths:
@@ -28,6 +16,7 @@ on:
2816
- '**/package.xml'
2917
- '**/CMakeLists.txt'
3018
- 'ros2_control-not-released.jazzy.repos'
19+
push: *event
3120
schedule:
3221
# Run every morning to detect flakiness and broken dependencies
3322
- cron: '03 1 * * MON-FRI'

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +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-
- '**/package.xml'
13-
- '**/CMakeLists.txt'
14-
- 'ros2_control.jazzy.repos'
15-
- 'codecov.yml'
16-
pull_request:
4+
pull_request: &event
175
branches:
186
- jazzy
197
paths:
@@ -25,6 +13,7 @@ on:
2513
- '**/CMakeLists.txt'
2614
- 'ros2_control.jazzy.repos'
2715
- 'codecov.yml'
16+
push: *event
2817

2918
jobs:
3019
coverage_jazzy:

.github/workflows/jazzy-pre-release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ jobs:
2525
ros_distro: jazzy
2626
# downstream_depth is not set on pull_request event
2727
prerelease_downstream_depth: ${{ github.event_name == 'pull_request' && '0' || inputs.downstream_depth }}
28+
prerelease_exclude_pkg: ackermann_steering_controller admittance_controller bicycle_steering_controller chained_filter_controller diff_drive_controller effort_controllers force_torque_sensor_broadcaster forward_command_controller gpio_controllers gps_sensor_broadcaster imu_sensor_broadcaster joint_state_broadcaster joint_trajectory_controller mecanum_drive_controller motion_primitives_controllers omni_wheel_drive_controller parallel_gripper_controller pid_controller pose_broadcaster position_controllers range_sensor_broadcaster ros2_controllers ros2_controllers_test_nodes rqt_joint_trajectory_controller steering_controllers_library tricycle_controller tricycle_steering_controller velocity_controllers gz_ros2_control gz_ros2_control_demos gz_ros2_control_tests

0 commit comments

Comments
 (0)