Skip to content

Commit 81afa50

Browse files
christophfroehlichchristophfroehlich
authored
Changes after branching humble (#217)
1 parent 6dd4a22 commit 81afa50

23 files changed

+369
-20
lines changed

‎.github/dependabot.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,10 @@ updates:
1111
directory: "/"
1212
schedule:
1313
interval: "weekly"
14+
- package-ecosystem: "github-actions"
15+
# Workflow files stored in the
16+
# default location of `.github/workflows`
17+
directory: "/"
18+
schedule:
19+
interval: "weekly"
20+
target-branch: "humble"

‎.github/mergify.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
pull_request_rules:
2+
- name: Backport to humble at reviewers discretion
3+
conditions:
4+
- base=master
5+
- "label=backport-humble"
6+
actions:
7+
backport:
8+
branches:
9+
- humble
10+
11+
- name: Ask to resolve conflict
12+
conditions:
13+
- conflict
14+
- author!=mergify[bot]
15+
- author!=dependabot[bot]
16+
actions:
17+
comment:
18+
message: This pull request is in conflict. Could you fix it @{{author}}?
19+
20+
- name: Ask to resolve conflict for backports
21+
conditions:
22+
- conflict
23+
- author=mergify[bot]
24+
actions:
25+
comment:
26+
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?
27+
28+
- name: development targets master branch
29+
conditions:
30+
- base!=master
31+
- author!=bmagyar
32+
- author!=destogl
33+
- author!=christophfroehlich
34+
- author!=saikishor
35+
- author!=mergify[bot]
36+
- author!=dependabot[bot]
37+
actions:
38+
comment:
39+
message: |
40+
@{{author}}, all pull requests must be targeted towards the `master` development branch.
41+
Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
42+
to have these changes reflected into new distributions.

‎.github/workflows/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
## Build status
22

3-
ROS2 Distro | Branch | Build status | Documentation | Released packages
3+
ROS 2 Distro | Branch | Build status | Documentation | Released packages
44
:---------: | :----: | :----------: | :-----------: | :---------------:
5-
**Rolling** <br />**Jazzy**<br />**Humble** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/binary-build.yml?branch=master) <br /> [![Source Build](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/source-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling)
6-
5+
**Rolling** <br />**Jazzy** | [`master`](https://github.com/ros-controls/realtime_tools/tree/master) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/rolling-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/rolling-binary-build.yml?branch=master) <br /> [![Source Build](https://github.com/ros-controls/realtime_tools/actions/workflows/rolling-source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/rolling-source-build.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#rolling)
6+
**Humble** | [`humble`](https://github.com/ros-controls/realtime_tools/tree/humble) | [![Binary Build](https://github.com/ros-controls/realtime_tools/actions/workflows/humble-binary-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/humble-binary-build.yml?branch=master) <br /> [![Source Build](https://github.com/ros-controls/realtime_tools/actions/workflows/humble-source-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/realtime_tools/actions/workflows/humble-source-build.yml?branch=master) | [API](http://docs.ros.org/en/humble/p/realtime_tools/) | [realtime_tools](https://index.ros.org/p/realtime_tools/#humble)
77

88

99
### Explanation of different build types

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Humble ABI Compatibility Check
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- humble
7+
8+
concurrency:
9+
# cancel previous runs of the same workflow, except for pushes on humble branch
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
12+
13+
jobs:
14+
abi_check:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: actions/checkout@v4
18+
- uses: ros-industrial/industrial_ci@master
19+
env:
20+
ROS_DISTRO: humble
21+
ROS_REPO: main
22+
ABICHECK_URL: github:${{ github.repository }}#${{ github.base_ref }}
23+
NOT_TEST_BUILD: true

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: Humble Windows Binary Build
2+
# author: Christoph Fröhlich <[email protected]>
3+
# description: 'Build & test all dependencies from released (binary) windows packages.'
4+
5+
on:
6+
workflow_dispatch:
7+
pull_request:
8+
branches:
9+
- humble
10+
# types:
11+
# - labeled
12+
push:
13+
branches:
14+
- humble
15+
# issue_comment:
16+
# types:
17+
# - created
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') }}
23+
24+
jobs:
25+
binary-windows:
26+
# if: |
27+
# (github.event_name == 'issue_comment' && contains(github.event.comment.body, '/check-windows')) ||
28+
# (github.event_name == 'pull_request' && contains(github.event.label.name, 'check-windows')) ||
29+
# (github.event_name == 'workflow_dispatch')
30+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-win-build.yml@master
31+
with:
32+
ros_distro: humble
33+
ref_for_scheduled_build: humble
34+
os_name: windows-2019

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

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Humble Binary Build
2+
# author: Denis Štogl <[email protected]>
3+
# description: 'Build & test all dependencies from released (binary) packages.'
4+
5+
on:
6+
workflow_dispatch:
7+
pull_request:
8+
branches:
9+
- humble
10+
push:
11+
branches:
12+
- humble
13+
schedule:
14+
# Run every morning to detect flakiness and broken dependencies
15+
- cron: '03 1 * * *'
16+
17+
concurrency:
18+
# cancel previous runs of the same workflow, except for pushes on humble branch
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
21+
22+
jobs:
23+
binary:
24+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
25+
strategy:
26+
fail-fast: false
27+
matrix:
28+
ROS_REPO: [main, testing]
29+
with:
30+
ros_distro: humble
31+
ros_repo: ${{ matrix.ROS_REPO }}
32+
ref_for_scheduled_build: master
33+
binary_clang:
34+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
35+
with:
36+
ros_distro: humble
37+
ros_repo: testing
38+
ref_for_scheduled_build: humlbe
39+
additional_debs: clang
40+
c_compiler: clang
41+
cxx_compiler: clang++
42+
not_test_build: true

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Humble Downstream Build
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+
push:
11+
branches:
12+
- humble
13+
14+
concurrency:
15+
# cancel previous runs of the same workflow, except for pushes on humble branch
16+
group: ${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
18+
19+
jobs:
20+
build-downstream:
21+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
22+
with:
23+
ros_distro: humble
24+
ros_repo: testing
25+
ref_for_scheduled_build: master
26+
not_test_build: true
27+
downstream_workspace: ros_controls.humble.repos
28+
not_test_downstream: true

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Humble Coverage Build
2+
on:
3+
workflow_dispatch:
4+
push:
5+
branches:
6+
- humble
7+
pull_request:
8+
branches:
9+
- humble
10+
11+
concurrency:
12+
# cancel previous runs of the same workflow, except for pushes on humble branch
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
15+
16+
jobs:
17+
coverage:
18+
name: coverage build
19+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
20+
secrets: inherit
21+
with:
22+
ros_distro: humble

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Humble Debian Build
2+
on:
3+
workflow_dispatch:
4+
pull_request:
5+
branches:
6+
- humble
7+
schedule:
8+
# Run every day to detect flakiness and broken dependencies
9+
- cron: '33 2 * * *'
10+
11+
concurrency:
12+
# cancel previous runs of the same workflow, except for pushes on humble branch
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: ${{ !startsWith(github.ref, '/refs/heads') }}
15+
16+
jobs:
17+
debian_source_build:
18+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
19+
with:
20+
ros_distro: humble
21+
ref_for_scheduled_build: humble

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Humble Pre-Commit
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
branches:
7+
- humble
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
pre-commit:
15+
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
16+
with:
17+
ros_distro: humble

0 commit comments

Comments
 (0)