Skip to content

Commit 8115834

Browse files
Merge branch 'master' into rqt-jtc-robot-description
2 parents 7329308 + 9ed7cbe commit 8115834

File tree

348 files changed

+16631
-4001
lines changed

Some content is hidden

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

348 files changed

+16631
-4001
lines changed

.github/ISSUE_TEMPLATE/good-first-issue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Good first issue
33
about: Create an issue to welcome a new contributor into the community.
44
title: ''
5-
labels: good-first-issue
5+
labels: ["good first issue"]
66
assignees: ''
77

88
---

.github/dependabot.yml

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

.github/mergify.yml

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

11-
- name: Backport to iron at reviewers discretion
12-
conditions:
13-
- base=master
14-
- "label=backport-iron"
15-
actions:
16-
backport:
17-
branches:
18-
- iron
19-
2011
- name: Ask to resolve conflict
2112
conditions:
2213
- conflict
@@ -32,14 +23,15 @@ pull_request_rules:
3223
- author=mergify[bot]
3324
actions:
3425
comment:
35-
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich?
26+
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?
3627

3728
- name: development targets master branch
3829
conditions:
3930
- base!=master
4031
- author!=bmagyar
4132
- author!=destogl
4233
- author!=christophfroehlich
34+
- author!=saikishor
4335
- author!=mergify[bot]
4436
- author!=dependabot[bot]
4537
actions:

.github/workflows/humble-abi-compatibility.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@ on:
88
- '**.hpp'
99
- '**.h'
1010
- '**.cpp'
11-
- '.github/workflows/humble-abi-compatibility.yml'
11+
- '**.py'
1212
- '**.yaml'
13+
- '.github/workflows/humble-abi-compatibility.yml'
1314
- '**/package.xml'
1415
- '**/CMakeLists.txt'
1516
- 'ros2_controllers-not-released.humble.repos'
17+
- '**.xml'
18+
19+
concurrency:
20+
# cancel previous runs of the same workflow, except for pushes on humble branch
21+
group: ${{ github.workflow }}-${{ github.ref }}
22+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
1623

1724
jobs:
1825
abi_check:
19-
runs-on: ubuntu-latest
20-
steps:
21-
- uses: actions/checkout@v4
22-
- uses: ros-industrial/industrial_ci@master
23-
env:
24-
ROS_DISTRO: humble
25-
ROS_REPO: testing
26-
ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
27-
NOT_TEST_BUILD: true
26+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@master
27+
with:
28+
ros_distro: humble

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,36 @@ on:
1111
- '**.hpp'
1212
- '**.h'
1313
- '**.cpp'
14-
- '.github/workflows/humble-binary-build.yml'
14+
- '**.py'
1515
- '**.yaml'
16+
- '.github/workflows/humble-binary-build.yml'
1617
- '**/package.xml'
1718
- '**/CMakeLists.txt'
1819
- 'ros2_controllers-not-released.humble.repos'
20+
- '**.xml'
1921
push:
2022
branches:
2123
- humble
2224
paths:
2325
- '**.hpp'
2426
- '**.h'
2527
- '**.cpp'
26-
- '.github/workflows/humble-binary-build.yml'
28+
- '**.py'
2729
- '**.yaml'
30+
- '.github/workflows/humble-binary-build.yml'
2831
- '**/package.xml'
2932
- '**/CMakeLists.txt'
3033
- 'ros2_controllers-not-released.humble.repos'
34+
- '**.xml'
3135
schedule:
3236
# Run every morning to detect flakiness and broken dependencies
3337
- cron: '03 1 * * *'
3438

39+
concurrency:
40+
# cancel previous runs of the same workflow, except for pushes on humble branch
41+
group: ${{ github.workflow }}-${{ github.ref }}
42+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
43+
3544
jobs:
3645
binary:
3746
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master

.github/workflows/humble-check-docs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ on:
1010
- '**.md'
1111
- '**.yaml'
1212

13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.ref }}
15+
cancel-in-progress: true
16+
1317
jobs:
1418
check-docs:
1519
name: Check Docs

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,34 @@ on:
88
- '**.hpp'
99
- '**.h'
1010
- '**.cpp'
11+
- '**.py'
12+
- '**.yaml'
1113
- '.github/workflows/humble-coverage-build.yml'
1214
- 'codecov.yml'
13-
- '**.yaml'
1415
- '**/package.xml'
1516
- '**/CMakeLists.txt'
1617
- 'ros2_controllers.humble.repos'
18+
- '**.xml'
1719
pull_request:
1820
branches:
1921
- humble
2022
paths:
2123
- '**.hpp'
2224
- '**.h'
2325
- '**.cpp'
26+
- '**.py'
27+
- '**.yaml'
2428
- '.github/workflows/humble-coverage-build.yml'
2529
- 'codecov.yml'
26-
- '**.yaml'
2730
- '**/package.xml'
2831
- '**/CMakeLists.txt'
2932
- 'ros2_controllers.humble.repos'
33+
- '**.xml'
34+
35+
concurrency:
36+
# cancel previous runs of the same workflow, except for pushes on humble branch
37+
group: ${{ github.workflow }}-${{ github.ref }}
38+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
3039

3140
jobs:
3241
coverage_humble:

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,21 @@ on:
88
- '**.hpp'
99
- '**.h'
1010
- '**.cpp'
11-
- '.github/workflows/humble-debian-build.yml'
11+
- '**.py'
1212
- '**.yaml'
13+
- '.github/workflows/humble-debian-build.yml'
1314
- '**/package.xml'
1415
- '**/CMakeLists.txt'
1516
- 'ros2_controllers.humble.repos'
17+
- '**.xml'
1618
schedule:
1719
# Run every day to detect flakiness and broken dependencies
1820
- cron: '03 1 * * *'
1921

22+
concurrency:
23+
# cancel previous runs of the same workflow, except for pushes on humble branch
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
2026

2127
jobs:
2228
humble_debian:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
branches:
77
- humble
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
jobs:
1014
pre-commit:
1115
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,22 @@ on:
88
- '**.hpp'
99
- '**.h'
1010
- '**.cpp'
11-
- '.github/workflows/humble-rhel-semi-binary-build.yml'
11+
- '**.py'
1212
- '**.yaml'
13+
- '.github/workflows/humble-rhel-semi-binary-build.yml'
1314
- '**/package.xml'
1415
- '**/CMakeLists.txt'
1516
- 'ros2_controllers.humble.repos'
17+
- '**.xml'
1618
schedule:
1719
# Run every day to detect flakiness and broken dependencies
1820
- cron: '03 1 * * *'
1921

22+
concurrency:
23+
# cancel previous runs of the same workflow, except for pushes on humble branch
24+
group: ${{ github.workflow }}-${{ github.ref }}
25+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
26+
2027
jobs:
2128
humble_rhel_binary:
2229
name: Humble RHEL binary build

0 commit comments

Comments
 (0)