Skip to content

Commit a6b613d

Browse files
saikishorsaikishor
authored
Merge branch 'master' into fix/exclusive_hw_interface_switching
2 parents 1977792 + f70a4c1 commit a6b613d

File tree

121 files changed

+1978
-1542
lines changed

Some content is hidden

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

121 files changed

+1978
-1542
lines changed

‎.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,10 @@ 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"

‎.github/mergify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ pull_request_rules:
88
branches:
99
- humble
1010

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

2020
- name: Ask to resolve conflict
2121
conditions:

‎.github/workflows/README.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,9 @@ jobs:
4444
fail-fast: false
4545
matrix:
4646
ROS_DISTRO: [humble]
47-
ROS_REPO: [testing]
4847
with:
4948
ros_distro: ${{ matrix.ROS_DISTRO }}
50-
ros_repo: ${{ matrix.ROS_REPO }}
49+
ros_repo: testing
5150
upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
5251
ref_for_scheduled_build: humble
5352
semi-binary-clang:

‎.github/workflows/humble-semi-binary-downstream-3rd-party-build.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Humble Downstream Build of 3rd-Party Packages
2+
# description: 'Build & test downstream packages from source.'
3+
# author: Christoph Froehlich <[email protected]>
4+
5+
on:
6+
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-semi-binary-downstream-3rd-party-build.yml'
17+
- '**/package.xml'
18+
- '**/CMakeLists.txt'
19+
- 'ros_controls.humble.repos'
20+
21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.ref }}
23+
cancel-in-progress: true
24+
25+
jobs:
26+
build-downstream-3rd-party:
27+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
28+
with:
29+
ros_distro: humble
30+
ros_repo: testing
31+
ref_for_scheduled_build: humble
32+
upstream_workspace: ros2_control.humble.repos
33+
# we don't test target_workspace, we just build it
34+
not_test_build: true
35+
# we don't test the downstream packages, which are outside of our organization
36+
downstream_workspace: | # build also the ros2_control packages
37+
ros_controls.humble.repos
38+
downstream.humble.repos
39+
not_test_downstream: true

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,3 @@ jobs:
3535
# we test the downstream packages, which are part of our organization
3636
downstream_workspace: ros_controls.humble.repos
3737
not_test_downstream: false
38-
build-downstream-3rd-party:
39-
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
40-
with:
41-
ros_distro: humble
42-
ros_repo: testing
43-
ref_for_scheduled_build: humble
44-
upstream_workspace: ros2_control.humble.repos
45-
# we don't test target_workspace, we just build it
46-
not_test_build: true
47-
# we don't test the downstream packages, which are outside of our organization
48-
downstream_workspace: | # build also the ros2_control packages
49-
ros_controls.humble.repos
50-
downstream.humble.repos
51-
not_test_downstream: true

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,4 @@ jobs:
2323
with:
2424
ros_distro: humble
2525
ref: humble
26-
ros2_repo_branch: humble
2726
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'
@@ -15,7 +15,7 @@ on:
1515
- 'ros2_control-not-released.jazzy.repos'
1616

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

‎.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
paths:
1111
- '**.hpp'
1212
- '**.h'
@@ -18,7 +18,7 @@ on:
1818
- 'ros2_control-not-released.jazzy.repos'
1919
push:
2020
branches:
21-
- master
21+
- jazzy
2222
paths:
2323
- '**.hpp'
2424
- '**.h'
@@ -33,7 +33,7 @@ on:
3333
- cron: '03 1 * * *'
3434

3535
concurrency:
36-
# 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
3737
group: ${{ github.workflow }}-${{ github.ref }}
3838
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
3939

@@ -49,4 +49,4 @@ jobs:
4949
ros_distro: ${{ matrix.ROS_DISTRO }}
5050
ros_repo: ${{ matrix.ROS_REPO }}
5151
upstream_workspace: ros2_control-not-released.${{ matrix.ROS_DISTRO }}.repos
52-
ref_for_scheduled_build: master
52+
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: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
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-
# - '**/package.xml'
14-
# - '**/CMakeLists.txt'
15-
# - 'ros2_control.jazzy.repos'
16-
# - 'codecov.yml'
17-
# pull_request:
18-
# branches:
19-
# - master
20-
# paths:
21-
# - '**.hpp'
22-
# - '**.h'
23-
# - '**.cpp'
24-
# - '.github/workflows/jazzy-coverage-build.yml'
25-
# - '**/package.xml'
26-
# - '**/CMakeLists.txt'
27-
# - 'ros2_control.jazzy.repos'
28-
# - 'codecov.yml'
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:
17+
branches:
18+
- jazzy
19+
paths:
20+
- '**.hpp'
21+
- '**.h'
22+
- '**.cpp'
23+
- '.github/workflows/jazzy-coverage-build.yml'
24+
- '**/package.xml'
25+
- '**/CMakeLists.txt'
26+
- 'ros2_control.jazzy.repos'
27+
- 'codecov.yml'
2928

3029
jobs:
3130
coverage_jazzy:

‎.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'
@@ -18,7 +18,7 @@ on:
1818
- cron: '03 1 * * *'
1919

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

@@ -32,5 +32,5 @@ jobs:
3232
with:
3333
ros_distro: ${{ matrix.ROS_DISTRO }}
3434
upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
35-
ref_for_scheduled_build: master
35+
ref_for_scheduled_build: jazzy
3636
skip_packages: rqt_controller_manager

‎.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-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'
@@ -18,7 +18,7 @@ on:
1818
- cron: '03 1 * * *'
1919

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

@@ -32,5 +32,5 @@ jobs:
3232
with:
3333
ros_distro: ${{ matrix.ROS_DISTRO }}
3434
upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
35-
ref_for_scheduled_build: master
35+
ref_for_scheduled_build: jazzy
3636
skip_packages: rqt_controller_manager

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

Lines changed: 8 additions & 13 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
paths:
1111
- '**.hpp'
1212
- '**.h'
@@ -18,7 +18,7 @@ on:
1818
- 'ros2_control.jazzy.repos'
1919
push:
2020
branches:
21-
- master
21+
- jazzy
2222
paths:
2323
- '**.hpp'
2424
- '**.h'
@@ -33,30 +33,25 @@ on:
3333
- cron: '03 1 * * *'
3434

3535
concurrency:
36-
# 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
3737
group: ${{ github.workflow }}-${{ github.ref }}
3838
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
3939

4040
jobs:
4141
semi-binary:
4242
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
43-
strategy:
44-
fail-fast: false
45-
matrix:
46-
ROS_DISTRO: [jazzy]
47-
ROS_REPO: [testing]
4843
with:
49-
ros_distro: ${{ matrix.ROS_DISTRO }}
50-
ros_repo: ${{ matrix.ROS_REPO }}
51-
upstream_workspace: ros2_control.${{ matrix.ROS_DISTRO }}.repos
52-
ref_for_scheduled_build: master
44+
ros_distro: jazzy
45+
ros_repo: testing
46+
upstream_workspace: ros2_control.jazzy.repos
47+
ref_for_scheduled_build: jazzy
5348
semi-binary-clang:
5449
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
5550
with:
5651
ros_distro: jazzy
5752
ros_repo: testing
5853
upstream_workspace: ros2_control.jazzy.repos
59-
ref_for_scheduled_build: master
54+
ref_for_scheduled_build: jazzy
6055
additional_debs: clang
6156
c_compiler: clang
6257
cxx_compiler: clang++

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Jazzy Downstream Build of 3rd-Party Packages
2+
# description: 'Build & test downstream packages from source.'
3+
# author: Christoph Froehlich <[email protected]>
4+
5+
on:
6+
workflow_dispatch:
7+
pull_request:
8+
branches:
9+
- jazzy
10+
paths:
11+
- '**.hpp'
12+
- '**.h'
13+
- '**.cpp'
14+
- '**.py'
15+
- '**.yaml'
16+
- '.github/workflows/jazzy-semi-binary-downstream-3rd-party-build.yml'
17+
- '**/package.xml'
18+
- '**/CMakeLists.txt'
19+
- 'ros_controls.jazzy.repos'
20+
21+
concurrency:
22+
group: ${{ github.workflow }}-${{ github.ref }}
23+
cancel-in-progress: true
24+
25+
jobs:
26+
build-downstream-3rd-party:
27+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
28+
with:
29+
ros_distro: jazzy
30+
ros_repo: testing
31+
ref_for_scheduled_build: jazzy
32+
upstream_workspace: ros2_control.jazzy.repos
33+
# we don't test target_workspace, we just build it
34+
not_test_build: true
35+
# we don't test the downstream packages, which are outside of our organization
36+
downstream_workspace: | # build also the ros_controls packages
37+
ros_controls.jazzy.repos
38+
downstream.jazzy.repos
39+
not_test_downstream: true

0 commit comments

Comments
 (0)