Skip to content

Commit

Permalink
Merge branch 'ros2-master' into dependabot/github_actions/actions/upl…
Browse files Browse the repository at this point in the history
…oad-artifact-4.3.1
  • Loading branch information
bmagyar authored Feb 13, 2024
2 parents 5502fa0 + 3b4725b commit 092dec5
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 168 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ on:

jobs:
binary:
uses: ros-controls/ros2_control/.github/workflows/reusable-industrial-ci-with-cache.yml@master
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-industrial-ci-with-cache.yml@master
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, iron, humble]
ROS_REPO: [main, testing]
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ on:

jobs:
source_build:
uses: ./.github/workflows/reusable-ros-tooling-source-build.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-ros-tooling-source-build.yml@master
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, iron, humble]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
- uses: actions/setup-python@v5
- name: Install clang-format-14
run: sudo apt-get install clang-format-14 cppcheck
- uses: pre-commit/[email protected].0
- uses: pre-commit/[email protected].1
with:
extra_args: --all-files --hook-stage manual
3 changes: 2 additions & 1 deletion .github/workflows/debian-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ on:

jobs:
debian_source_build:
uses: ./.github/workflows/reusable-debian-build.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-debian-build.yml@master
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, iron, humble]
with:
Expand Down
78 changes: 0 additions & 78 deletions .github/workflows/reusable-debian-build.yml

This file was deleted.

82 changes: 0 additions & 82 deletions .github/workflows/reusable-rhel-binary-build.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .github/workflows/rhel-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ on:

jobs:
rhel_semi_binary_build:
uses: ./.github/workflows/reusable-rhel-binary-build.yml
uses: ros-controls/ros2_control_ci/.github/workflows/reusable-rhel-binary-build.yml@master
strategy:
fail-fast: false
matrix:
ROS_DISTRO: [rolling, iron, humble]
with:
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ See the documentation of [ros2_control](http://control.ros.org) and release info
## Build status
ROS2 Distro | Branch | Build status | Documentation | Released packages
:---------: | :----: | :----------: | :-----------: | :---------------:
**Rolling** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | [![Build rolling](https://github.com/ros-controls/control_toolbox/actions/workflows/build-rolling.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-rolling.yml) <br /> [![Rolling Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_rollling.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_rollling.yml) | [API](http://docs.ros.org/en/rolling/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#rolling)
**Iron** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | [![Build iron](https://github.com/ros-controls/control_toolbox/actions/workflows/build-iron.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-iron.yml) <br /> [![Iron Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_iron.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_iron.yml) | [API](http://docs.ros.org/en/iron/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#iron)
**Humble** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | [![Build humble](https://github.com/ros-controls/control_toolbox/actions/workflows/build-humble.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-humble.yml) <br /> [![Humble Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_humble.yml/badge.svg)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source_humble.yml) | [API](http://docs.ros.org/en/humble/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#humble)
**Rolling** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | [![Binary Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-binary.yml/badge.svg?branch=master)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-binary.yml?branch=master) <br /> [![Rolling Source Build](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source.yml/badge.svg?branch=master)](https://github.com/ros-controls/control_toolbox/actions/workflows/build-source.yml?branch=master) | [API](http://docs.ros.org/en/rolling/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#rolling)
**Iron** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | see above | [API](http://docs.ros.org/en/iron/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#iron)
**Humble** | [`master`](https://github.com/ros-controls/control_toolbox/tree/master) | see above | [API](http://docs.ros.org/en/humble/p/control_toolbox/) | [control_toolbox](https://index.ros.org/p/control_toolbox/#humble)

## Publication

Expand Down

0 comments on commit 092dec5

Please sign in to comment.