Skip to content

Commit ba3d43c

Browse files
Merge branch 'humble' into fix/source
2 parents ab2d9d5 + 1aff36e commit ba3d43c

File tree

170 files changed

+3588
-1480
lines changed

Some content is hidden

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

170 files changed

+3588
-1480
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

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

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

.github/PULL_REQUEST_TEMPLATE/pull_request_template.md

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

.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: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,23 @@ pull_request_rules:
88
branches:
99
- galactic
1010

11-
- name: Backport to foxy at reviewers discretion
11+
- name: Backport to jazzy at reviewers discretion
1212
conditions:
1313
- base=master
14-
- "label=backport-foxy"
14+
- "label=backport-jazzy"
1515
actions:
1616
backport:
1717
branches:
18-
- foxy
18+
- jazzy
19+
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
1928

2029
- name: Ask to resolve conflict
2130
conditions:

.github/workflows/README.md

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

.github/workflows/docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
uses: docker/setup-buildx-action@v3
2323

2424
- name: Checkout repository
25-
uses: actions/checkout@v4
25+
uses: actions/checkout@v6
2626

2727
- name: Log in to the Container registry
2828
uses: docker/login-action@v3
@@ -62,7 +62,7 @@ jobs:
6262
uses: docker/setup-buildx-action@v3
6363

6464
- name: Checkout repository
65-
uses: actions/checkout@v4
65+
uses: actions/checkout@v6
6666

6767
- name: Log in to the Container registry
6868
uses: docker/login-action@v3

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,19 @@ on:
99
- '**.h'
1010
- '**.cpp'
1111
- '**.py'
12+
- '**.yaml'
1213
- '.github/workflows/humble-abi-compatibility.yml'
1314
- '**/package.xml'
1415
- '**/CMakeLists.txt'
1516
- 'ros2_control-not-released.humble.repos'
1617

1718
concurrency:
18-
# cancel previous runs of the same workflow, except for pushes on humble branch
19+
# cancel previous runs of the same workflow, except for pushes on given branches
1920
group: ${{ github.workflow }}-${{ github.ref }}
20-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
21+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
2122

2223
jobs:
2324
abi_check:
24-
runs-on: ubuntu-latest
25-
steps:
26-
- uses: actions/checkout@v4
27-
- uses: ros-industrial/industrial_ci@master
28-
env:
29-
ROS_DISTRO: humble
30-
ROS_REPO: main
31-
ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
32-
NOT_TEST_BUILD: true
25+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@master
26+
with:
27+
ros_distro: humble

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

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,28 @@ 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:
2311
- '**.hpp'
2412
- '**.h'
2513
- '**.cpp'
2614
- '**.py'
15+
- '**.yaml'
2716
- '.github/workflows/humble-binary-build.yml'
2817
- '**/package.xml'
2918
- '**/CMakeLists.txt'
3019
- 'ros2_control-not-released.humble.repos'
20+
push: *event
3121
schedule:
3222
# Run every morning to detect flakiness and broken dependencies
33-
- cron: '03 1 * * *'
23+
- cron: '03 1 * * MON-FRI'
3424

3525
concurrency:
36-
# cancel previous runs of the same workflow, except for pushes on humble branch
26+
# cancel previous runs of the same workflow, except for pushes on given branches
3727
group: ${{ github.workflow }}-${{ github.ref }}
38-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
28+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
3929

4030
jobs:
4131
binary:

0 commit comments

Comments
 (0)