Skip to content

Commit

Permalink
Add iron branch (#1155)
Browse files Browse the repository at this point in the history
  • Loading branch information
bmagyar authored Nov 6, 2023
1 parent 845d3f5 commit 6100c5c
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 22 deletions.
9 changes: 9 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ pull_request_rules:
branches:
- humble

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

- name: Ask to resolve conflict
conditions:
- conflict
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/iron-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Iron - ABI Compatibility Check
on:
workflow_dispatch:
branches:
- master
- iron
pull_request:
branches:
- master
- iron

jobs:
abi_check:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/iron-binary-build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ name: Iron Binary Build - main
on:
workflow_dispatch:
branches:
- master
- iron
pull_request:
branches:
- master
- iron
push:
branches:
- master
- iron
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'
Expand All @@ -23,4 +23,4 @@ jobs:
ros_distro: iron
ros_repo: main
upstream_workspace: ros2_control-not-released.iron.repos
ref_for_scheduled_build: master
ref_for_scheduled_build: iron
8 changes: 4 additions & 4 deletions .github/workflows/iron-binary-build-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ name: Iron Binary Build - testing
on:
workflow_dispatch:
branches:
- master
- iron
pull_request:
branches:
- master
- iron
push:
branches:
- master
- iron
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '03 1 * * *'
Expand All @@ -23,4 +23,4 @@ jobs:
ros_distro: iron
ros_repo: testing
upstream_workspace: ros2_control-not-released.iron.repos
ref_for_scheduled_build: master
ref_for_scheduled_build: iron
8 changes: 4 additions & 4 deletions .github/workflows/iron-semi-binary-build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ name: Iron Semi-Binary Build - main
on:
workflow_dispatch:
branches:
- master
- iron
pull_request:
branches:
- master
- iron
push:
branches:
- master
- iron
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'
Expand All @@ -22,4 +22,4 @@ jobs:
ros_distro: iron
ros_repo: main
upstream_workspace: ros2_control.iron.repos
ref_for_scheduled_build: master
ref_for_scheduled_build: iron
8 changes: 4 additions & 4 deletions .github/workflows/iron-semi-binary-build-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ name: Iron Semi-Binary Build - testing
on:
workflow_dispatch:
branches:
- master
- iron
pull_request:
branches:
- master
- iron
push:
branches:
- master
- iron
schedule:
# Run every morning to detect flakiness and broken dependencies
- cron: '33 1 * * *'
Expand All @@ -22,4 +22,4 @@ jobs:
ros_distro: iron
ros_repo: testing
upstream_workspace: ros2_control.iron.repos
ref_for_scheduled_build: master
ref_for_scheduled_build: iron
6 changes: 3 additions & 3 deletions .github/workflows/iron-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Iron Source Build
on:
workflow_dispatch:
branches:
- master
- iron
push:
branches:
- master
- iron
schedule:
# Run every day to detect flakiness and broken dependencies
- cron: '03 3 * * *'
Expand All @@ -15,5 +15,5 @@ jobs:
uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
with:
ros_distro: iron
ref: master
ref: iron
ros2_repo_branch: iron
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ For more, please check the [documentation](https://control.ros.org/).
ROS2 Distro | Branch | Build status | Documentation | Released packages
:---------: | :----: | :----------: | :-----------: | :---------------:
**Rolling** | [`master`](https://github.com/ros-controls/ros2_control/tree/master) | [![Rolling Binary Build](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-binary-build-main.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-binary-build-main.yml?branch=master) <br /> [![Rolling Semi-Binary Build](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-semi-binary-build-main.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-semi-binary-build-main.yml?branch=master) | [Documentation](https://control.ros.org/master/index.html) <br /> [API Reference](https://control.ros.org/master/doc/api/index.html) | [ros2_control](https://index.ros.org/p/ros2_control/#rolling)
**Iron** | [`master`](https://github.com/ros-controls/ros2_control/tree/master) | [![Iron Binary Build](https://github.com/ros-controls/ros2_control/actions/workflows/iron-binary-build-main.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control/actions/workflows/iron-binary-build-main.yml?branch=master) <br /> [![Iron Semi-Binary Build](https://github.com/ros-controls/ros2_control/actions/workflows/iron-semi-binary-build-main.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control/actions/workflows/iron-semi-binary-build-main.yml?branch=master) | [Documentation](https://control.ros.org/master/index.html) <br /> [API Reference](https://control.ros.org/master/doc/api/index.html) | [ros2_control](https://index.ros.org/p/ros2_control/#iron)
**Iron** | [`iron`](https://github.com/ros-controls/ros2_control/tree/iron) | [![Iron Binary Build](https://github.com/ros-controls/ros2_control/actions/workflows/iron-binary-build-main.yml/badge.svg?branch=iron)](https://github.com/ros-controls/ros2_control/actions/workflows/iron-binary-build-main.yml?branch=iron) <br /> [![Iron Semi-Binary Build](https://github.com/ros-controls/ros2_control/actions/workflows/iron-semi-binary-build-main.yml/badge.svg?branch=iron)](https://github.com/ros-controls/ros2_control/actions/workflows/iron-semi-binary-build-main.yml?branch=iron) | [Documentation](https://control.ros.org/iron/index.html) <br /> [API Reference](https://control.ros.org/iron/doc/api/index.html) | [ros2_control](https://index.ros.org/p/ros2_control/#iron)
**Humble** | [`humble`](https://github.com/ros-controls/ros2_control/tree/humble) | [![Humble Binary Build](https://github.com/ros-controls/ros2_control/actions/workflows/humble-binary-build-main.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control/actions/workflows/humble-binary-build-main.yml?branch=master) <br /> [![Humble Semi-Binary Build](https://github.com/ros-controls/ros2_control/actions/workflows/humble-semi-binary-build-main.yml/badge.svg?branch=master)](https://github.com/ros-controls/ros2_control/actions/workflows/humble-semi-binary-build-main.yml?branch=master) | [Documentation](https://control.ros.org/humble/index.html) <br /> [API Reference](https://control.ros.org/humble/doc/api/index.html) | [ros2_control](https://index.ros.org/p/ros2_control/#humble)

[Detailed build status](.github/workflows/README.md)
Expand Down

0 comments on commit 6100c5c

Please sign in to comment.