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.

Sign up for GitHub

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

Sync develop with elise #143

Merged
merged 11 commits into from
Nov 2, 2021
Merged

Sync develop with elise #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6bcefc4
Update to C++14 (#113)
mjeronimo Jun 25, 2021
1f45c8d
Update to package format 3 and run xmllint (#117)
mjeronimo Jun 29, 2021
d35d4d7
Update tags for noetic develop (#120)
msmcconnell Jul 5, 2021
2a49d34
Merge pull request #121 from usdot-fhwa-stol/develop
msmcconnell Jul 12, 2021
09c653b
Update config.yml to use colcon for the build and test commands (#124)
msmcconnell Jul 15, 2021
4187038
Merge branch 'master' into feature/sync_noetic_with_3.7.0
Aug 10, 2021
5bc81b8
Merge pull request #133 from usdot-fhwa-stol/feature/sync_noetic_with…
msmcconnell Aug 10, 2021
389c52b
Merge branch 'develop' into sync_noetic_with_develop
Sep 29, 2021
2eaa343
Merge pull request #141 from usdot-fhwa-stol/sync_noetic_with_develop
msmcconnell Sep 29, 2021
f4afa6d
update config to point candidate
SaikrishnaBairamoni Oct 12, 2021
f5959b4
Sync develop with release/elise
Nov 1, 2021
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 2 additions & 5 deletions can_msgs/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>

Expand Down
4 changes: 2 additions & 2 deletions carma_debug_msgs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions cav_msgs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions cav_srvs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions j2735_msgs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down