From 56e376618f39fc89160d2c9e7f5e77e1a72dca2d Mon Sep 17 00:00:00 2001 From: Cody Garver Date: Mon, 14 Nov 2022 12:47:52 -0500 Subject: [PATCH] WIP --- .circleci/config.yml | 4 ++-- docker/checkout.bash | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8a1500b..6e8556e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -50,8 +50,8 @@ jobs: name: Pull Deps command: | source ${INIT_ENV} - ./src/CARMASscInterfaceWrapper/docker/checkout.bash -r ${PWD} - chmod +x /home/carma/.ci-image/engineering_tools/code_coverage/make_with_coverage.bash + ./src/CARMASscInterfaceWrapper/docker/checkout.bash --ros2_build -r ${PWD} + sed -i '/colcon build/ s/$/ --packages-up-to ssc_interface_wrapper_ros2 pacmod3 kvaser_interface/' ~/.ci-image/engineering_tools/code_coverage/make_with_coverage.bash - run: name: Build Driver command: | diff --git a/docker/checkout.bash b/docker/checkout.bash index f897d4d..93e07e2 100755 --- a/docker/checkout.bash +++ b/docker/checkout.bash @@ -33,14 +33,22 @@ while [[ $# -gt 0 ]]; do shift ;; -ros1|--ros1_build) - dir=~/workspace_ros1 + if [[ "$CI" == "true" ]]; then + dir="/opt/carma" + else + dir=~/workspace_ros1 + fi echo "Checkout ros1 dependencies" build_ros1_pkgs="$true" build_ros2_pkgs="$false" shift ;; -ros2|--ros2_build) - dir=~/workspace_ros2 + if [[ "$CI" == "true" ]]; then + dir="/opt/carma" + else + dir=~/workspace_ros2 + fi echo "Checkout ros2 dependencies" build_ros1_pkgs="$false" build_ros2_pkgs="$true"