Skip to content

Commit 9c00354

Browse files
jsantoso91jsantoso91
authored
Merge branch 'master' into testfix/call_activate_and_configure_on_controller
2 parents 083cd71 + b75fe9e commit 9c00354

File tree

96 files changed

+387
-232
lines changed

Some content is hidden

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

96 files changed

+387
-232
lines changed

‎.github/mergify.yml‎

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

11+
- name: Backport to jazzy at reviewers discretion
12+
conditions:
13+
- base=master
14+
- "label=backport-jazzy"
15+
actions:
16+
backport:
17+
branches:
18+
- jazzy
19+
1120
- name: Ask to resolve conflict
1221
conditions:
1322
- conflict

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

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 4 additions & 4 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 31 additions & 32 deletions
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 5 additions & 5 deletions
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++

0 commit comments

Comments
 (0)