From 7bff6f9a1e186995ccc8150af45d5a23a3c8ec5d Mon Sep 17 00:00:00 2001 From: Sneha Ganesh Date: Thu, 4 Mar 2021 13:31:28 -0500 Subject: [PATCH] Adding noetic build to CI. --- .circleci/config.yml | 36 +++++++++++++++++-- include/pacmod_game_control/publish_control.h | 1 + .../publish_control_factory.h | 2 ++ src/pacmod_game_control_node.cpp | 2 ++ src/publish_control.cpp | 2 ++ src/publish_control_factory.cpp | 2 ++ 6 files changed, 43 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f1ca1e..7cd61aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,6 @@ jobs: apt-get update -qq source `find /opt/ros -name setup.bash | sort | head -1` mkdir pacmod_game_control && mv `find -maxdepth 1 -not -name . -not -name pacmod_game_control` pacmod_game_control/ - git clone https://github.com/astuff/astuff_sensor_msgs astuff_sensor_msgs rosdep install --from-paths . --ignore-src -y cd .. catkin init @@ -45,7 +44,6 @@ jobs: apt-get update -qq source `find /opt/ros -name setup.bash | sort | head -1` mkdir pacmod_game_control && mv `find -maxdepth 1 -not -name . -not -name pacmod_game_control` pacmod_game_control/ - git clone https://github.com/astuff/astuff_sensor_msgs astuff_sensor_msgs rosdep install --from-paths . --ignore-src -y cd .. catkin init @@ -68,9 +66,43 @@ jobs: catkin_test_results working_directory: ~/src + noetic: + docker: + - image: autonomoustuff/docker-builds:noetic-ros-base + steps: + - checkout + - run: + name: Set Up Container + command: | + apt-get update -qq + source `find /opt/ros -name setup.bash | sort | head -1` + mkdir pacmod_game_control && mv `find -maxdepth 1 -not -name . -not -name pacmod_game_control` pacmod_game_control/ + rosdep install --from-paths . --ignore-src -y + cd .. + catkin init + catkin config --extend /opt/ros/$ROS_DISTRO + - run: + name: Build + command: | + cd .. + catkin build + - run: + name: Lint + command: | + catkin build pacmod_game_control --no-deps --make-args roslint + - run: + name: Run Tests + command: | + source /opt/ros/noetic/setup.bash + cd .. + catkin run_tests pacmod_game_control --no-deps + catkin_test_results + working_directory: ~/src + workflows: version: 2 ros_build: jobs: - kinetic - melodic + - noetic diff --git a/include/pacmod_game_control/publish_control.h b/include/pacmod_game_control/publish_control.h index 1263889..ab141f8 100644 --- a/include/pacmod_game_control/publish_control.h +++ b/include/pacmod_game_control/publish_control.h @@ -11,6 +11,7 @@ #include "pacmod_game_control/globals.h" #include +#include namespace AS { diff --git a/include/pacmod_game_control/publish_control_factory.h b/include/pacmod_game_control/publish_control_factory.h index 68c88d2..6d0bc08 100644 --- a/include/pacmod_game_control/publish_control_factory.h +++ b/include/pacmod_game_control/publish_control_factory.h @@ -12,6 +12,8 @@ #include "pacmod_game_control/publish_control_board_rev2.h" #include "pacmod_game_control/publish_control_board_rev3.h" +#include + namespace AS { namespace Joystick diff --git a/src/pacmod_game_control_node.cpp b/src/pacmod_game_control_node.cpp index f952bf7..c6cdb66 100644 --- a/src/pacmod_game_control_node.cpp +++ b/src/pacmod_game_control_node.cpp @@ -9,6 +9,8 @@ #include "pacmod_game_control/globals.h" #include "pacmod_game_control/startup_checks.h" +#include + using namespace AS::Joystick; // NOLINT /* diff --git a/src/publish_control.cpp b/src/publish_control.cpp index f15f36f..166b456 100644 --- a/src/publish_control.cpp +++ b/src/publish_control.cpp @@ -7,6 +7,8 @@ #include "pacmod_game_control/publish_control.h" +#include + using namespace AS::Joystick; // NOLINT JoyAxis PublishControl::steering_axis = LEFT_STICK_LR; diff --git a/src/publish_control_factory.cpp b/src/publish_control_factory.cpp index ce257e3..15ad887 100644 --- a/src/publish_control_factory.cpp +++ b/src/publish_control_factory.cpp @@ -7,6 +7,8 @@ #include "pacmod_game_control/publish_control_factory.h" +#include + using namespace AS::Joystick; // NOLINT PublishControlFactory::PublishControlFactory()