Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pull_request_rules:

- name: Backport to humble at reviewers discretion
conditions:
- base=ros2-master
- base=master
- "label=backport-humble"
actions:
backport:
Expand All @@ -11,13 +11,22 @@ pull_request_rules:

- name: Backport to jazzy at reviewers discretion
conditions:
- base=ros2-master
- base=master
- "label=backport-jazzy"
actions:
backport:
branches:
- jazzy

- name: Backport to kilted at reviewers discretion
conditions:
- base=master
- "label=backport-kilted"
actions:
backport:
branches:
- kilted

- name: Ask to resolve conflict
conditions:
- conflict
Expand All @@ -35,9 +44,9 @@ pull_request_rules:
comment:
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?

- name: development targets ros2-master branch
- name: development targets master branch
conditions:
- base!=ros2-master
- base!=master
- author!=bmagyar
- author!=destogl
- author!=christophfroehlich
Expand All @@ -47,6 +56,6 @@ pull_request_rules:
actions:
comment:
message: |
@{{author}}, all pull requests must be targeted towards the `ros2-master` development branch.
Once merged into `ros2-master`, it is possible to backport to `{{base}}`, but it must be in `ros2-master`
@{{author}}, all pull requests must be targeted towards the `master` development branch.
Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
to have these changes reflected into new distributions.
2 changes: 1 addition & 1 deletion .github/workflows/jazzy-build-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- jazzy
paths: &paths-filter
paths:
- '**.hpp'
- '**.h'
- '**.cpp'
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/kilted-abi-compatibility.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Kilted - ABI Compatibility Check
on:
workflow_dispatch:
pull_request:
branches:
- kilted
paths:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/kilted-abi-compatibility.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xml'

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

jobs:
abi_check:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-abi-check.yml@master
with:
ros_distro: kilted
52 changes: 52 additions & 0 deletions .github/workflows/kilted-binary-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)

name: Kilted - Binary Build
on:
pull_request: &event
branches:
- kilted
paths:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/kilted-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'control_toolbox-not-released.kilted.repos'
- '**.xml'
push: *event
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '28 6 * * MON-FRI'

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

jobs:
binary:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
fail-fast: false
matrix:
ROS_REPO: [main, testing]
with:
ros_distro: kilted
ros_repo: ${{ matrix.ROS_REPO }}
upstream_workspace: control_toolbox-not-released.kilted.repos
ref_for_scheduled_build: kilted
binary_clang:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: kilted
ros_repo: testing
upstream_workspace: control_toolbox-not-released.kilted.repos
ref_for_scheduled_build: kilted
additional_debs: clang
c_compiler: clang
cxx_compiler: clang++
not_test_build: true
29 changes: 29 additions & 0 deletions .github/workflows/kilted-build-coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Kilted - Coverage Build
on:
workflow_dispatch:
pull_request: &event
branches:
- kilted
paths:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/kilted-build-coverage.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xml'
push: *event

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

jobs:
coverage:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-build-coverage.yml@master
secrets: inherit
with:
ros_distro: kilted
38 changes: 38 additions & 0 deletions .github/workflows/kilted-build-downstream.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git).
# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst)

name: Kilted - Downstream Build
on:
pull_request:
branches:
- kilted
paths:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/kilted-build-downstream.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'control_toolbox.kilted.repos'
- 'ros_controls.kilted.repos'
- '**.xml'

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

jobs:
build-downstream:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: kilted
ros_repo: testing
ref_for_scheduled_build: kilted
not_test_build: true
upstream_workspace: control_toolbox.kilted.repos
# we test the downstream packages, which are part of our organization
downstream_workspace: ros_controls.kilted.repos
not_test_downstream: false
37 changes: 37 additions & 0 deletions .github/workflows/kilted-build-source.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Kilted - Source Build
on:
workflow_dispatch:
push:
branches:
- kilted
paths:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/kilted-build-source.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- '**.xml'
pull_request:
branches:
- kilted
paths:
- .github/workflows/kilted-build-source.yml
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 3 * * MON-FRI'

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

jobs:
source_build:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
with:
ros_distro: kilted
ref: kilted
container: ubuntu:24.04
30 changes: 30 additions & 0 deletions .github/workflows/kilted-check-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Kilted Check Docs

on:
workflow_dispatch:
pull_request:
branches:
- kilted
paths:
- '**.rst'
- '**.md'
- '**.jpg'
- '**.jpeg'
- '**.png'
- '**.svg'
- '**.yml'
- '**.yaml'
- '!.github/**' # exclude yaml files in .github directory
- '.github/workflows/kilted-check-docs.yml'

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

jobs:
check-docs:
name: Check Docs
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@kilted
with:
CONTROL_TOOLBOX_PR: ${{ github.ref }}
21 changes: 21 additions & 0 deletions .github/workflows/kilted-ci-pre-commit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Kilted - Pre-Commit

on:
workflow_dispatch:
pull_request:
branches:
- kilted
push:
branches:
- kilted

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

jobs:
pre-commit:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
with:
ros_distro: kilted
33 changes: 33 additions & 0 deletions .github/workflows/kilted-debian-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Kilted - Debian Semi-Binary Build
on:
workflow_dispatch:
pull_request:
branches:
- kilted
paths:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/kilted-debian-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'control_toolbox.kilted.repos'
- '**.xml'
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 5 * * MON-FRI'

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

jobs:
debian_semi_binary_build:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
with:
ros_distro: kilted
upstream_workspace: control_toolbox.kilted.repos
ref_for_scheduled_build: kilted
27 changes: 27 additions & 0 deletions .github/workflows/kilted-pre-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Kilted - pre-release
# author: Christoph Froehlich <christoph.froehlich@ait.ac.at>

on:
workflow_dispatch:
inputs:
downstream_depth:
description: 'The depth of the depends-on tree to be included in the overlay workspace (-1 implies unlimited, default: 0)'
required: false
default: 0
type: number
pull_request:
branches:
- kilted
types:
- opened # default
- reopened # default
- synchronize # default
- labeled # also if a label changes

jobs:
default:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-prerelease.yml@master
with:
ros_distro: kilted
# downstream_depth is not set on pull_request event
prerelease_downstream_depth: ${{ github.event_name == 'pull_request' && '0' || inputs.downstream_depth }}
33 changes: 33 additions & 0 deletions .github/workflows/kilted-rhel-semi-binary-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Kilted - RHEL Semi-Binary Build
on:
workflow_dispatch:
pull_request:
branches:
- kilted
paths:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/kilted-rhel-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'control_toolbox.kilted.repos'
- '**.xml'
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 3 * * MON-FRI'

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

jobs:
rhel_semi_binary_build:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
with:
ros_distro: kilted
upstream_workspace: control_toolbox.kilted.repos
ref_for_scheduled_build: kilted
Loading