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
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ updates:
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "github-actions"
# Workflow files stored in the
# default location of `.github/workflows`
directory: "/"
schedule:
interval: "weekly"
target-branch: "jazzy"
- package-ecosystem: "github-actions"
# Workflow files stored in the
# default location of `.github/workflows`
Expand Down
52 changes: 52 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
pull_request_rules:

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

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

- name: Ask to resolve conflict
conditions:
- conflict
- author!=mergify[bot]
- author!=dependabot[bot]
actions:
comment:
message: This pull request is in conflict. Could you fix it @{{author}}?

- name: Ask to resolve conflict for backports
conditions:
- conflict
- author=mergify[bot]
actions:
comment:
message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?

- name: development targets master branch
conditions:
- base!=master
- author!=bmagyar
- author!=destogl
- author!=christophfroehlich
- author!=saikishor
- author!=mergify[bot]
- author!=dependabot[bot]
actions:
comment:
message: |
@{{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.
24 changes: 24 additions & 0 deletions .github/workflows/jazzy-binary-downstream-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Jazzy Downstream Build
# description: 'Build & test downstream packages from source.'
# author: Christoph Froehlich <[email protected]>

on:
workflow_dispatch:
pull_request:
branches:
- jazzy

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build-downstream:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
with:
ros_distro: jazzy
ros_repo: testing
ref_for_scheduled_build: jazzy
not_test_build: true
downstream_workspace: ros_controls.jazzy.repos
not_test_downstream: true
32 changes: 32 additions & 0 deletions .github/workflows/jazzy-build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Jazzy Binary Build
# author: Denis Štogl <[email protected]>
# description: 'Build & test all dependencies from released (binary) packages.'

on:
workflow_dispatch:
pull_request:
branches:
- jazzy
push:
branches:
- jazzy
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '28 6 * * *'

concurrency:
# cancel previous runs of the same workflow, except for pushes on jazzy 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: jazzy
ros_repo: ${{ matrix.ROS_REPO }}
ref_for_scheduled_build: jazzy
18 changes: 18 additions & 0 deletions .github/workflows/jazzy-pre-commit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Jazzy Pre-Commit

on:
workflow_dispatch:
pull_request:
branches:
- jazzy

concurrency:
# cancel previous runs of the same workflow
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
pre-commit:
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-pre-commit.yml@master
with:
ros_distro: jazzy
2 changes: 1 addition & 1 deletion .github/workflows/rolling-binary-downstream-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [jazzy, rolling]
ROS_DISTRO: [rolling]
ROS_REPO: [testing]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rolling-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [jazzy, rolling]
ROS_DISTRO: [rolling]
ROS_REPO: [main, testing]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rolling-pre-commit.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Pre-Commit
name: Rolling Pre-Commit

on:
workflow_dispatch:
Expand All @@ -17,6 +17,6 @@ jobs:
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [jazzy, rolling]
ROS_DISTRO: [rolling]
with:
ros_distro: ${{ matrix.ROS_DISTRO }}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ See [control_msgs documentation](https://index.ros.org/p/control_msgs/) on index
|--------------|-----------------|--------------|
| Noetic | [kinetic-devel](https://github.com/ros-controls/control_msgs/tree/kinetic-devel) | [Build status](https://travis-ci.org/ros-controls/control_msgs) |
| Humble | [humble](https://github.com/ros-controls/control_msgs/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/humble-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/humble-build.yml) |
| Jazzy | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) |
| Rolling | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) |
| Jazzy | [jazzy](https://github.com/ros-controls/control_msgs/tree/jazzy) | [![Jazzy Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/jazzy-build.yml/badge.svg?branch=jazzy)](https://github.com/ros-controls/control_msgs/actions/workflows/jazzy-build.yml) |
| Rolling | [master](https://github.com/ros-controls/control_msgs/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml/badge.svg?branch=master)](https://github.com/ros-controls/control_msgs/actions/workflows/rolling-build.yml) |

## Code Formatting

Expand Down