Merge pull request #148 from usdot-fhwa-stol/release/elise

Release/elise
usdot-fhwa-stol · Dec 15, 2021 · 525938f · 525938f
2 parents 6ca3633 + c322a75
commit 525938f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
     # Setup docker
     docker:
-      - image: usdotfhwastol/carma-base:carma-system-3.9.0
+      - image: usdotfhwastol/carma-base:carma-system-3.10.0
         user: carma
         environment:
           TERM: xterm # use xterm to get full display output from build
@@ -24,11 +24,11 @@ jobs:
           command: |
             source ${INIT_ENV}
             export ROS_PARALLEL_JOBS='-j1 -l1' # Try to reduce memory consumption on build
-            catkin_make install
+            colcon build
       - run:
           name: Run C++ Tests
           command: |
             source ${INIT_ENV}
             source /opt/carma/devel/setup.bash
             export ROS_PARALLEL_JOBS='-j1 -l1' # Try to reduce memory consumption on build
-            catkin_make run_tests
+            colcon test
diff --git a/can_msgs/package.xml b/can_msgs/package.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0"?>
-<package format="3">.
+<package format="3">
   <name>can_msgs</name>
   <version>1.2.1</version>
   <description>CAN related message types.</description>
-
   <maintainer email="mathias.luedtke@ipa.fraunhofer.de">Mathias Lüdtke</maintainer>
-  <author email="ivor@iwanders.net">Ivor Wanders</author>
-
   <license>BSD</license>
-
   <url type="website">http://wiki.ros.org/can_msgs</url>
   <url type="repository">https://github.com/ros-industrial/ros_canopen</url>
   <url type="bugtracker">https://github.com/ros-industrial/ros_canopen/issues</url>
+  <author email="ivor@iwanders.net">Ivor Wanders</author>
 
   <buildtool_depend>catkin</buildtool_depend>
 

diff --git a/carma_debug_msgs/CMakeLists.txt b/carma_debug_msgs/CMakeLists.txt
@@ -17,8 +17,8 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(carma_debug_msgs)
 
-## Compile as C++11, supported in ROS Kinetic and newer
-add_compile_options(-std=c++11)
+## Compile as C++14, supported in ROS Noetic and newer
+add_compile_options(-std=c++14)
 
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)

diff --git a/cav_msgs/CMakeLists.txt b/cav_msgs/CMakeLists.txt
@@ -17,8 +17,8 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(cav_msgs)
 
-## Compile as C++11, supported in ROS Kinetic and newer
-add_compile_options(-std=c++11)
+## Compile as C++14, supported in ROS Noetic and newer
+add_compile_options(-std=c++14)
 
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)

diff --git a/cav_srvs/CMakeLists.txt b/cav_srvs/CMakeLists.txt
@@ -17,8 +17,8 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(cav_srvs)
 
-## Compile as C++11, supported in ROS Kinetic and newer
-# add_compile_options(-std=c++11)
+## Compile as C++14, supported in ROS Noetic and newer
+# add_compile_options(-std=c++14)
 
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)

diff --git a/j2735_msgs/CMakeLists.txt b/j2735_msgs/CMakeLists.txt
@@ -17,8 +17,8 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(j2735_msgs)
 
-## Compile as C++11, supported in ROS Kinetic and newer
-add_compile_options(-std=c++11)
+## Compile as C++14, supported in ROS Noetic and newer
+add_compile_options(-std=c++14)
 
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)