Skip to content

Commit 1fc6bcf

Browse files
authored
Merge branch 'ros-controls:master' into testfix/call_activate_and_configure_on_controller
2 parents 9c00354 + 1c24ee2 commit 1fc6bcf

File tree

312 files changed

+12539
-4585
lines changed

Some content is hidden

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

312 files changed

+12539
-4585
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ on:
1717
- '**.xml'
1818

1919
concurrency:
20-
# cancel previous runs of the same workflow, except for pushes on humble branch
20+
# cancel previous runs of the same workflow, except for pushes on given branches
2121
group: ${{ github.workflow }}-${{ github.ref }}
22-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
22+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
2323

2424
jobs:
2525
abi_check:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ on:
3434
- '**.xml'
3535
schedule:
3636
# Run every morning to detect flakiness and broken dependencies
37-
- cron: '03 1 * * *'
37+
- cron: '03 1 * * MON-FRI'
3838

3939
concurrency:
40-
# cancel previous runs of the same workflow, except for pushes on humble branch
40+
# cancel previous runs of the same workflow, except for pushes on given branches
4141
group: ${{ github.workflow }}-${{ github.ref }}
42-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
42+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
4343

4444
jobs:
4545
binary:

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ on:
88
paths:
99
- '**.rst'
1010
- '**.md'
11+
- '**.jpg'
12+
- '**.jpeg'
13+
- '**.png'
14+
- '**.svg'
15+
- '**.yml'
1116
- '**.yaml'
17+
- '!.github/**' # exclude yaml files in .github directory
18+
- '.github/workflows/humble-check-docs.yml'
1219

1320
concurrency:
1421
group: ${{ github.workflow }}-${{ github.ref }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ on:
3333
- '**.xml'
3434

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

4040
jobs:
4141
coverage_humble:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Debian Humble Source Build
1+
name: Humble - Debian Semi-Binary Build
22
on:
33
workflow_dispatch:
44
pull_request:
@@ -17,15 +17,15 @@ on:
1717
- '**.xml'
1818
schedule:
1919
# Run every day to detect flakiness and broken dependencies
20-
- cron: '03 1 * * *'
20+
- cron: '03 1 * * MON-FRI'
2121

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

2727
jobs:
28-
humble_debian:
28+
debian_semi_binary_build:
2929
name: Humble debian build
3030
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
3131
with:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
pull_request:
66
branches:
77
- humble
8+
push:
9+
branches:
10+
- humble
811

912
concurrency:
1013
group: ${{ github.workflow }}-${{ github.ref }}
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Humble - pre-release
2+
# author: Christoph Froehlich <[email protected]>
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
downstream_depth:
8+
description: 'The depth of the depends-on tree to be included in the overlay workspace (-1 implies unlimited, default: 0)'
9+
required: false
10+
default: 0
11+
type: number
12+
pull_request:
13+
branches:
14+
- humble
15+
types:
16+
- opened # default
17+
- reopened # default
18+
- synchronize # default
19+
- labeled # also if a label changes
20+
21+
jobs:
22+
default:
23+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-prerelease.yml@master
24+
with:
25+
ros_distro: humble
26+
# downstream_depth is not set on pull_request event
27+
prerelease_downstream_depth: ${{ github.event_name == 'pull_request' && '0' || inputs.downstream_depth }}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: RHEL Humble Binary Build
1+
name: Humble - RHEL Semi-Binary Build
22
on:
33
workflow_dispatch:
44
pull_request:
@@ -17,15 +17,15 @@ on:
1717
- '**.xml'
1818
schedule:
1919
# Run every day to detect flakiness and broken dependencies
20-
- cron: '03 1 * * *'
20+
- cron: '03 1 * * MON-FRI'
2121

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

2727
jobs:
28-
humble_rhel_binary:
28+
rhel_semi_binary_build:
2929
name: Humble RHEL binary build
3030
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
3131
with:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ on:
3333
- '**.xml'
3434
schedule:
3535
# Run every morning to detect flakiness and broken dependencies
36-
- cron: '33 1 * * *'
36+
- cron: '33 1 * * MON-FRI'
3737

3838
concurrency:
39-
# cancel previous runs of the same workflow, except for pushes on humble branch
39+
# cancel previous runs of the same workflow, except for pushes on given branches
4040
group: ${{ github.workflow }}-${{ github.ref }}
41-
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
41+
cancel-in-progress: ${{ !startsWith(github.ref, 'refs/heads') }}
4242

4343
jobs:
4444
semi_binary:

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

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

0 commit comments

Comments
 (0)