-
Notifications
You must be signed in to change notification settings - Fork 311
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into docs-about-chained-controllers
- Loading branch information
Showing
89 changed files
with
1,391 additions
and
614 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 0 additions & 10 deletions
10
...REQUEST_TEMPLATE/pull_request_template.md → .github/pull_request_template.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
|
|
||
| ROS2 Distro | Branch | Build status | Documentation | Released packages | ||
| :---------: | :----: | :----------: | :-----------: | :---------------: | ||
| **Rolling** | [`rolling`](https://github.com/ros-controls/ros2_control/tree/rolling) | [](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-binary-build-main.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-binary-build-testing.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-semi-binary-build-main.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-semi-binary-build-testing.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-source-build.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) | ||
| **Humble** | [`humble`](https://github.com/ros-controls/ros2_control/tree/humble) | [](https://github.com/ros-controls/ros2_control/actions/workflows/humble-binary-build-main.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/humble-binary-build-testing.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/humble-semi-binary-build-main.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/humble-semi-binary-build-testing.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/humble-source-build.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/#humble) | ||
| **Galactic** | [`galactic`](https://github.com/ros-controls/ros2_control/tree/galactic) | [](https://github.com/ros-controls/ros2_control/actions/workflows/galactic-binary-build-main.yml?branch=galactic) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/galactic-binary-build-testing.yml?branch=galactic) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/galactic-semi-binary-build-main.yml?branch=galactic) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/galactic-semi-binary-build-testing.yml?branch=galactic) | [Documentation](https://control.ros.org/galactic/index.html) <br /> [API Reference](https://control.ros.org/galactic/doc/api/index.html) | [ros2_control](https://index.ros.org/p/ros2_control/#galactic) | ||
| **Foxy** | [`foxy`](https://github.com/ros-controls/ros2_control/tree/foxy) | [](https://github.com/ros-controls/ros2_control/actions/workflows/foxy-binary-build-main.yml?branch=foxy) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/foxy-binary-build-testing.yml?branch=foxy) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/foxy-semi-binary-build-main.yml?branch=foxy) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/foxy-semi-binary-build-testing.yml?branch=foxy) | [Documentation](https://control.ros.org/foxy/index.html) <br /> [API Reference](https://control.ros.org/foxy/doc/api/index.html) | [ros2_control](https://index.ros.org/p/ros2_control/#foxy) | ||
| **Rolling** | [`master`](https://github.com/ros-controls/ros2_control/tree/master) | [](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-binary-build-main.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-binary-build-testing.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-semi-binary-build-main.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-semi-binary-build-testing.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/rolling-source-build.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) | [](https://github.com/ros-controls/ros2_control/actions/workflows/iron-binary-build-main.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/iron-binary-build-testing.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/iron-semi-binary-build-main.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/iron-semi-binary-build-testing.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/iron-source-build.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) | ||
| **Humble** | [`humble`](https://github.com/ros-controls/ros2_control/tree/humble) | [](https://github.com/ros-controls/ros2_control/actions/workflows/humble-binary-build-main.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/humble-binary-build-testing.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/humble-semi-binary-build-main.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/humble-semi-binary-build-testing.yml?branch=master) <br /> [](https://github.com/ros-controls/ros2_control/actions/workflows/humble-source-build.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) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,11 +16,11 @@ jobs: | |
| env: | ||
| ROS_DISTRO: rolling | ||
| steps: | ||
| - uses: ros-tooling/[email protected].1 | ||
| - uses: ros-tooling/[email protected].2 | ||
| with: | ||
| required-ros-distributions: ${{ env.ROS_DISTRO }} | ||
| - uses: actions/checkout@v3 | ||
| - uses: ros-tooling/[email protected].0 | ||
| - uses: ros-tooling/[email protected].2 | ||
| with: | ||
| target-ros2-distro: ${{ env.ROS_DISTRO }} | ||
| import-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
@@ -44,7 +44,7 @@ jobs: | |
| } | ||
| } | ||
| colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml | ||
| - uses: codecov/[email protected].1 | ||
| - uses: codecov/[email protected].4 | ||
| with: | ||
| file: ros_ws/lcov/total_coverage.info | ||
| flags: unittests | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,11 +13,11 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-python@v4.5.0 | ||
| - uses: actions/setup-python@v4.6.1 | ||
| with: | ||
| python-version: '3.10' | ||
| - name: Install system hooks | ||
| run: sudo apt install -qq clang-format-14 cppcheck | ||
| run: sudo apt install -qq cppcheck | ||
| - uses: pre-commit/[email protected] | ||
| with: | ||
| extra_args: --all-files --hook-stage manual | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ jobs: | |
| linter: [cppcheck, copyright, lint_cmake] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: ros-tooling/[email protected].1 | ||
| - uses: ros-tooling/[email protected].2 | ||
| - uses: ros-tooling/[email protected] | ||
| with: | ||
| distribution: rolling | ||
|
|
@@ -36,7 +36,7 @@ jobs: | |
| linter: [cpplint] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: ros-tooling/[email protected].1 | ||
| - uses: ros-tooling/[email protected].2 | ||
| - uses: ros-tooling/[email protected] | ||
| with: | ||
| distribution: rolling | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| name: Foxy Binary Build - main | ||
| name: Iron Binary Build - main | ||
| # author: Denis Štogl <[email protected]> | ||
| # description: 'Build & test all dependencies from released (binary) packages.' | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| branches: | ||
| - foxy | ||
| - master | ||
| pull_request: | ||
| branches: | ||
| - foxy | ||
| - master | ||
| push: | ||
| branches: | ||
| - foxy | ||
| - master | ||
| schedule: | ||
| # Run every morning to detect flakiness and broken dependencies | ||
| - cron: '03 1 * * *' | ||
|
|
@@ -20,7 +20,7 @@ jobs: | |
| binary: | ||
| uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml | ||
| with: | ||
| ros_distro: foxy | ||
| ros_distro: iron | ||
| ros_repo: main | ||
| upstream_workspace: ros2_control-not-released.foxy.repos | ||
| ref_for_scheduled_build: foxy | ||
| upstream_workspace: ros2_control-not-released.iron.repos | ||
| ref_for_scheduled_build: master | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| name: Galactic Binary Build - main | ||
| name: Iron Binary Build - testing | ||
| # author: Denis Štogl <[email protected]> | ||
| # description: 'Build & test all dependencies from released (binary) packages.' | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| branches: | ||
| - galactic | ||
| - master | ||
| pull_request: | ||
| branches: | ||
| - galactic | ||
| - master | ||
| push: | ||
| branches: | ||
| - galactic | ||
| - master | ||
| schedule: | ||
| # Run every morning to detect flakiness and broken dependencies | ||
| - cron: '03 1 * * *' | ||
|
|
@@ -20,7 +20,7 @@ jobs: | |
| binary: | ||
| uses: ./.github/workflows/reusable-industrial-ci-with-cache.yml | ||
| with: | ||
| ros_distro: galactic | ||
| ros_repo: main | ||
| upstream_workspace: ros2_control-not-released.galactic.repos | ||
| ref_for_scheduled_build: galactic | ||
| ros_distro: iron | ||
| ros_repo: testing | ||
| upstream_workspace: ros2_control-not-released.iron.repos | ||
| ref_for_scheduled_build: master | ||
Oops, something went wrong.