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

updated for carma-base-3.7.1 release #40

Merged
merged 3 commits into from
May 7, 2020
Merged
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
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
# Pull docker image from docker hub
# XTERM used for better catkin_make output
docker:
- image: usdotfhwastol/carma-base:3.7.0
- image: usdotfhwastol/carma-base:3.7.1
user: carma
environment:
TERM: xterm
Expand Down Expand Up @@ -57,11 +57,13 @@ jobs:
name: Build Driver
command: |
source ${INIT_ENV}
export ROS_PARALLEL_JOBS='-j1 -l1' # Try to reduce memory consumption on build
build-wrapper-linux-x86-64 --out-dir /opt/carma/bw-output bash make_with_coverage.bash -m -e /opt/carma/ -o ./coverage_reports/gcov
- run:
name: Run C++ Tests
command: |
source ${INIT_ENV}
export ROS_PARALLEL_JOBS='-j1 -l1' # Try to reduce memory consumption on build
bash make_with_coverage.bash -t -e /opt/carma/ -o ./coverage_reports/gcov
# Run SonarCloud analysis
# PR Branchs and number extracted from Circle variables and github api
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ src/VimbaCPP/
lib/
bin/
build/
docs/

# Auto generated code
cfg/cpp/
Expand Down
2 changes: 1 addition & 1 deletion docker/checkout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# CARMA packages checkout script
# Optional argument to set the root checkout directory with no ending '/' default is '~'

set -ex
set -exo pipefail

dir=~
while [[ $# -gt 0 ]]; do
Expand Down
Empty file added docs/PULL_REQUEST_TEMPLATE.md
Empty file.