From 7d62eb1439dc5f0dd2eba421420b1bdb9f97c0b8 Mon Sep 17 00:00:00 2001 From: jtbaird Date: Wed, 6 May 2020 17:07:57 -0400 Subject: [PATCH] updated for carma-base-3.7.1 release, and fixed link in PR template --- .circleci/config.yml | 2 +- docker/checkout.sh | 2 +- docs/pull_request_template.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e0fb9d7..5df62d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: # Pull docker image from docker hub # XTERM used for better catkin_make output docker: - - image: usdotfhwastol/carma-base:3.6.0 + - image: usdotfhwastol/carma-base:3.7.1 user: carma environment: TERM: xterm # use xterm to get full display output from build diff --git a/docker/checkout.sh b/docker/checkout.sh index f9f674c..f087eed 100755 --- a/docker/checkout.sh +++ b/docker/checkout.sh @@ -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 diff --git a/docs/pull_request_template.md b/docs/pull_request_template.md index 01ae083..5bc2cf4 100644 --- a/docs/pull_request_template.md +++ b/docs/pull_request_template.md @@ -39,6 +39,6 @@ - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [ ] I have read the **CONTRIBUTING** document. -[CARMA Contributing Guide](Contributing.md) +[CARMA Contributing Guide](https://github.com/usdot-fhwa-stol/carma-platform/blob/develop/Contributing.md) - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed.