From 602976b45f5ba49e5c7f9a5f5954a1fe11b31602 Mon Sep 17 00:00:00 2001 From: Jose Antonio Moral Date: Tue, 1 Dec 2020 11:58:57 +0100 Subject: [PATCH] micro_ros_msgs has its own repository now (#40) * micro_ros_msgs has its own repository now * Update CI * Update CI * Fix CI order * Error in YAML file * Source ROS2 * Add rosdep update * Fix --- .github/workflows/ci.yml | 24 +++++++++++-------- micro_ros_msgs/CMakeLists.txt | 43 ----------------------------------- micro_ros_msgs/msg/Entity.msg | 8 ------- micro_ros_msgs/msg/Graph.msg | 1 - micro_ros_msgs/msg/Node.msg | 3 --- micro_ros_msgs/package.xml | 22 ------------------ 6 files changed, 15 insertions(+), 86 deletions(-) delete mode 100644 micro_ros_msgs/CMakeLists.txt delete mode 100644 micro_ros_msgs/msg/Entity.msg delete mode 100644 micro_ros_msgs/msg/Graph.msg delete mode 100644 micro_ros_msgs/msg/Node.msg delete mode 100644 micro_ros_msgs/package.xml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 106e26e..3fbc77d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,18 +9,24 @@ jobs: microros_agent_ci: runs-on: ubuntu-20.04 - container: ros:foxy - - steps: - - uses: actions/checkout@v2 - with: - path: src/micro_ros_agent + container: microros/base:foxy + steps: - name: Download dependencies run: | - git clone -b foxy https://github.com/eProsima/Micro-XRCE-DDS-Agent src/microxrcedds_agent - + cd /uros_ws + . /opt/ros/foxy/setup.sh + . install/local_setup.sh + rosdep update + ros2 run micro_ros_setup create_agent_ws.sh + + - uses: actions/checkout@v2 + with: + path: src/uros/micro-ROS-Agent + - name: Build run: | + cd /uros_ws . /opt/ros/foxy/setup.sh - colcon build \ No newline at end of file + . install/local_setup.sh + ros2 run micro_ros_setup build_agent.sh \ No newline at end of file diff --git a/micro_ros_msgs/CMakeLists.txt b/micro_ros_msgs/CMakeLists.txt deleted file mode 100644 index 7d087be..0000000 --- a/micro_ros_msgs/CMakeLists.txt +++ /dev/null @@ -1,43 +0,0 @@ -cmake_minimum_required(VERSION 3.5) -project(micro_ros_msgs) - -# Default to C99 -if(NOT CMAKE_C_STANDARD) - set(CMAKE_C_STANDARD 99) -endif() - -# Default to C++14 -if(NOT CMAKE_CXX_STANDARD) - set(CMAKE_CXX_STANDARD 14) -endif() - -if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - add_compile_options(-Wall -Wextra -Wpedantic) -endif() - -# find dependencies -find_package(ament_cmake REQUIRED) -find_package(rosidl_default_generators REQUIRED) -# uncomment the following section in order to fill in -# further dependencies manually. -# find_package( REQUIRED) - -if(BUILD_TESTING) - find_package(ament_lint_auto REQUIRED) - # the following line skips the linter which checks for copyrights - # uncomment the line when a copyright and license is not present in all source files - #set(ament_cmake_copyright_FOUND TRUE) - # the following line skips cpplint (only works in a git repo) - # uncomment the line when this package is not in a git repo - #set(ament_cmake_cpplint_FOUND TRUE) - ament_lint_auto_find_test_dependencies() -endif() - -rosidl_generate_interfaces( - ${PROJECT_NAME} - "msg/Graph.msg" - "msg/Node.msg" - "msg/Entity.msg" -) - -ament_package() diff --git a/micro_ros_msgs/msg/Entity.msg b/micro_ros_msgs/msg/Entity.msg deleted file mode 100644 index 8f2209b..0000000 --- a/micro_ros_msgs/msg/Entity.msg +++ /dev/null @@ -1,8 +0,0 @@ -byte PUBLISHER=0 -byte SUBSCRIBER=1 -byte SERVICE_SERVER=2 -byte SERVICE_CLIENT=3 - -byte entity_type -string<=256 name -string<=256[] types diff --git a/micro_ros_msgs/msg/Graph.msg b/micro_ros_msgs/msg/Graph.msg deleted file mode 100644 index 85410ba..0000000 --- a/micro_ros_msgs/msg/Graph.msg +++ /dev/null @@ -1 +0,0 @@ -Node[] nodes diff --git a/micro_ros_msgs/msg/Node.msg b/micro_ros_msgs/msg/Node.msg deleted file mode 100644 index b881a68..0000000 --- a/micro_ros_msgs/msg/Node.msg +++ /dev/null @@ -1,3 +0,0 @@ -string<=256 node_namespace -string<=256 node_name -Entity[] entities diff --git a/micro_ros_msgs/package.xml b/micro_ros_msgs/package.xml deleted file mode 100644 index aaab209..0000000 --- a/micro_ros_msgs/package.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - micro_ros_msgs - 0.0.1 - TODO: Package description - Pablo Garrido - Apache License 2.0 - - ament_cmake - - ament_lint_auto - ament_lint_common - - rosidl_default_generators - rosidl_default_runtime - rosidl_interface_packages - - - ament_cmake - -