WIP

usdot-fhwa-stol · Nov 14, 2022 · 56e3766 · 56e3766
1 parent cabadbf
commit 56e3766
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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"