From 5f140dee18e058c0859662f7e2f63cd5b56ba536 Mon Sep 17 00:00:00 2001 From: Arne Nordmann Date: Sun, 5 Jun 2022 11:11:16 +0200 Subject: [PATCH 1/3] Seperate CI for focal and jammy. Added humble distro Signed-off-by: Arne Nordmann --- .github/workflows/{ci.yaml => ci-focal.yaml} | 12 +++--- .github/workflows/ci-jammy.yaml | 41 ++++++++++++++++++++ README.md | 3 +- 3 files changed, 49 insertions(+), 7 deletions(-) rename .github/workflows/{ci.yaml => ci-focal.yaml} (78%) create mode 100644 .github/workflows/ci-jammy.yaml diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci-focal.yaml similarity index 78% rename from .github/workflows/ci.yaml rename to .github/workflows/ci-focal.yaml index b7da1d9..fbdd337 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci-focal.yaml @@ -1,4 +1,4 @@ -name: "CI: foxy, galactic, rolling" +name: "CI: foxy, galactic on focal" on: push: @@ -16,15 +16,15 @@ jobs: fail-fast: false matrix: os: [ ubuntu-20.04 ] - ros_distribution: [ foxy, galactic, rolling ] + ros_distribution: [ foxy, galactic ] steps: - - uses: actions/checkout@v2.3.4 - - uses: ros-tooling/setup-ros@v0.2 + - uses: actions/checkout@v3 + - uses: ros-tooling/setup-ros@v0.3 with: required-ros-distributions: ${{ matrix.ros_distribution }} - uses : ros-tooling/action-ros-ci@v0.2 with: - package-name: "launch_system_modes system_modes system_modes_examples system_modes_msgs test_launch_system_modes " + package-name: "launch_system_modes system_modes system_modes_examples system_modes_msgs test_launch_system_modes" target-ros2-distro: ${{ matrix.ros_distribution }} colcon-defaults: | { @@ -36,6 +36,6 @@ jobs: } } colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml - - uses: codecov/codecov-action@v1.5.0 + - uses: codecov/codecov-action@v3 with: file: ros_ws/lcov/total_coverage.info diff --git a/.github/workflows/ci-jammy.yaml b/.github/workflows/ci-jammy.yaml new file mode 100644 index 0000000..526da23 --- /dev/null +++ b/.github/workflows/ci-jammy.yaml @@ -0,0 +1,41 @@ +name: "CI: humble, rolling on jammy" + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + schedule: + # Run once per day to detect broken dependencies. + - cron: '17 5 * * *' + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-22.04 ] + ros_distribution: [ humble, rolling ] + steps: + - uses: actions/checkout@v3 + - uses: ros-tooling/setup-ros@v0.3 + with: + required-ros-distributions: ${{ matrix.ros_distribution }} + - uses : ros-tooling/action-ros-ci@v0.2 + with: + package-name: "launch_system_modes system_modes system_modes_examples system_modes_msgs test_launch_system_modes" + target-ros2-distro: ${{ matrix.ros_distribution }} + colcon-defaults: | + { + "build": { + "mixin": ["coverage-gcc", "coverage-pytest"] + }, + "test": { + "mixin": ["coverage-pytest"] + } + } + colcon-mixin-repository: https://raw.githubusercontent.com/colcon/colcon-mixin-repository/master/index.yaml + - uses: codecov/codecov-action@v3 + with: + file: ros_ws/lcov/total_coverage.info diff --git a/README.md b/README.md index 9bb5e89..5c357a6 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ [![License](https://img.shields.io/badge/License-Apache%202-blue.svg)](https://github.com/micro-ROS/system_modes/blob/master/LICENSE) [![Build status](http://build.ros2.org/job/Fdev__system_modes__ubuntu_focal_amd64/badge/icon?subject=Build%20farm%3A%20Foxy)](http://build.ros2.org/job/Fdev__system_modes__ubuntu_focal_amd64/) [![Build status](http://build.ros2.org/job/Gdev__system_modes__ubuntu_focal_amd64/badge/icon?subject=Build%20farm%3A%20Galaxy)](http://build.ros2.org/job/Gdev__system_modes__ubuntu_focal_amd64/) -[![Build status](http://build.ros2.org/job/Rdev__system_modes__ubuntu_focal_amd64/badge/icon?subject=Build%20farm%3A%20Rolling)](http://build.ros2.org/job/Rdev__system_modes__ubuntu_focal_amd64/) +[![Build status](http://build.ros2.org/job/Hdev__system_modes__ubuntu_jammy_amd64/badge/icon?subject=Build%20farm%3A%20Humble)](http://build.ros2.org/job/Hdev__system_modes__ubuntu_jammy_amd64/) +[![Build status](http://build.ros2.org/job/Rdev__system_modes__ubuntu_jammy_amd64/badge/icon?subject=Build%20farm%3A%20Rolling)](http://build.ros2.org/job/Rdev__system_modes__ubuntu_jammy_amd64/) [![Build status](https://github.com/micro-ROS/system_modes/workflows/Build%20action%3A%20Foxy%20%2B%20Rolling/badge.svg)](https://github.com/micro-ROS/system_modes/actions) [![Code coverage](https://codecov.io/gh/micro-ROS/system_modes/branch/master/graph/badge.svg)](https://codecov.io/gh/micro-ROS/system_modes) From 1740054666bbab7a9c2b53b9208ab5fb7b108d1b Mon Sep 17 00:00:00 2001 From: Arne Nordmann Date: Sun, 5 Jun 2022 11:34:27 +0200 Subject: [PATCH 2/3] Fixed cpplint include-order issues Signed-off-by: Arne Nordmann --- system_modes/include/system_modes/mode.hpp | 8 ++++---- system_modes_examples/src/drive_base.cpp | 6 +++--- system_modes_examples/src/manipulator.cpp | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/system_modes/include/system_modes/mode.hpp b/system_modes/include/system_modes/mode.hpp index b6fc5f7..925ab75 100644 --- a/system_modes/include/system_modes/mode.hpp +++ b/system_modes/include/system_modes/mode.hpp @@ -16,10 +16,6 @@ #include "system_modes/mode_impl.hpp" -#include -#include -#include - #include #include #include @@ -28,6 +24,10 @@ #include #include +#include +#include +#include + namespace system_modes { diff --git a/system_modes_examples/src/drive_base.cpp b/system_modes_examples/src/drive_base.cpp index b1991c3..d59bd98 100644 --- a/system_modes_examples/src/drive_base.cpp +++ b/system_modes_examples/src/drive_base.cpp @@ -12,15 +12,15 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include #include #include -#include -#include - using lifecycle_msgs::msg::State; using lifecycle_msgs::msg::Transition; using rclcpp_lifecycle::LifecycleNode; diff --git a/system_modes_examples/src/manipulator.cpp b/system_modes_examples/src/manipulator.cpp index ebb578f..c064960 100644 --- a/system_modes_examples/src/manipulator.cpp +++ b/system_modes_examples/src/manipulator.cpp @@ -12,15 +12,15 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. +#include +#include + #include #include #include #include -#include -#include - using lifecycle_msgs::msg::State; using lifecycle_msgs::msg::Transition; using rclcpp_lifecycle::LifecycleNode; From ffcc8def23dbfa3da84acaf70dac78852b74e913 Mon Sep 17 00:00:00 2001 From: Arne Nordmann Date: Sun, 5 Jun 2022 11:42:09 +0200 Subject: [PATCH 3/3] Ignore build-order Let cpplint ignore include-order, as the desired order was now updated and would need separate branches for foxy+galactic and humble+rolling. Signed-off-by: Arne Nordmann --- CPPLINT.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CPPLINT.cfg b/CPPLINT.cfg index 2693575..2282f4b 100644 --- a/CPPLINT.cfg +++ b/CPPLINT.cfg @@ -1,2 +1,2 @@ set noparent -filter=-build/header_guard,-runtime/string +filter=-build/header_guard,-runtime/string,-build/include_order \ No newline at end of file