Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Seperate CI for focal and jammy. Added humble distro to workflow #93

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
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
12 changes: 6 additions & 6 deletions .github/workflows/ci.yaml → .github/workflows/ci-focal.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: "CI: foxy, galactic, rolling"
name: "CI: foxy, galactic on focal"

on:
push:
Expand All @@ -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: |
{
Expand All @@ -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
41 changes: 41 additions & 0 deletions .github/workflows/ci-jammy.yaml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion CPPLINT.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
set noparent
filter=-build/header_guard,-runtime/string
filter=-build/header_guard,-runtime/string,-build/include_order
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 4 additions & 4 deletions system_modes/include/system_modes/mode.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@

#include "system_modes/mode_impl.hpp"

#include <rclcpp/macros.hpp>
#include <rclcpp/node_interfaces/node_parameters.hpp>
#include <rclcpp/parameter_map.hpp>

#include <map>
#include <mutex>
#include <string>
Expand All @@ -28,6 +24,10 @@
#include <utility>
#include <iostream>

#include <rclcpp/macros.hpp>
#include <rclcpp/node_interfaces/node_parameters.hpp>
#include <rclcpp/parameter_map.hpp>

namespace system_modes
{

Expand Down
6 changes: 3 additions & 3 deletions system_modes_examples/src/drive_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <memory>
#include <vector>

#include <rclcpp/rclcpp.hpp>
#include <rclcpp_lifecycle/lifecycle_node.hpp>

#include <lifecycle_msgs/msg/state.hpp>
#include <lifecycle_msgs/msg/transition.hpp>

#include <memory>
#include <vector>

using lifecycle_msgs::msg::State;
using lifecycle_msgs::msg::Transition;
using rclcpp_lifecycle::LifecycleNode;
Expand Down
6 changes: 3 additions & 3 deletions system_modes_examples/src/manipulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <memory>
#include <vector>

#include <rclcpp/rclcpp.hpp>
#include <rclcpp_lifecycle/lifecycle_node.hpp>

#include <lifecycle_msgs/msg/state.hpp>
#include <lifecycle_msgs/msg/transition.hpp>

#include <memory>
#include <vector>

using lifecycle_msgs::msg::State;
using lifecycle_msgs::msg::Transition;
using rclcpp_lifecycle::LifecycleNode;
Expand Down