try to fix CI build

usdot-fhwa-stol · Sep 9, 2024 · 942782a · 942782a
1 parent d3b66fa
commit 942782a
Showing 1 changed file with 23 additions and 22 deletions.
diff --git a/docker/checkout.bash b/docker/checkout.bash
@@ -20,6 +20,9 @@
 set -exo pipefail
 declare -i false=0 true=1
 BRANCH=develop
+build_ros1_pkgs="$false"
+build_ros2_pkgs="$false"
+dir=~/
 while [[ $# -gt 0 ]]; do
       arg="$1"
       case $arg in
@@ -34,16 +37,14 @@ while [[ $# -gt 0 ]]; do
                   shift
             ;;
             -ros1|--ros1_build)
-                  dir=~/workspace_ros1
+                  dir_ros1=$dir/ros1_deps
                   echo "Checkout ros1 dependencies"
                   build_ros1_pkgs="$true"
-                  build_ros2_pkgs="$false"
                   shift
             ;;
             -ros2|--ros2_build)
-                  dir=~/workspace_ros2
+                  dir_ros2=$dir/ros2_deps
                   echo "Checkout ros2 dependencies"
-                  build_ros1_pkgs="$false"
                   build_ros2_pkgs="$true"
                   shift
             ;;
@@ -59,50 +60,50 @@ git clone https://github.com/usdot-fhwa-stol/carma-utils.git ${dir}/src/CARMAUti
 if [ $build_ros1_pkgs -eq 1 ]; then
 
     # Required to build the dbw_pacifica_msgs message set.
-    sudo git clone https://github.com/NewEagleRaptor/raptor-dbw-ros.git ${dir}/src/raptor-dbw-ros --branch master
-    cd ${dir}/src/raptor-dbw-ros
+    sudo git clone https://github.com/NewEagleRaptor/raptor-dbw-ros.git ${dir_ros1}/src/raptor-dbw-ros --branch master
+    cd ${dir_ros1}/src/raptor-dbw-ros
     sudo git reset --hard f50f91cd88ad27b2ce05bab1f8ff780931c41475
-    cd ${dir}
+    cd ${dir_ros1}
 
     # Required for ford fusion drive by wire
-    sudo git clone https://bitbucket.org/DataspeedInc/dbw_mkz_ros.git ${dir}/src/dbw-mkz-ros --branch 1.2.4
+    sudo git clone https://bitbucket.org/DataspeedInc/dbw_mkz_ros.git ${dir_ros1}/src/dbw-mkz-ros --branch 1.2.4
 
-    sudo git clone https://github.com/astuff/pacmod3.git ${dir}/src/pacmod3 --branch ros1_master
-    cd ${dir}/src/pacmod3
+    sudo git clone https://github.com/astuff/pacmod3.git ${dir_ros1}/src/pacmod3 --branch ros1_master
+    cd ${dir_ros1}/src/pacmod3
     sudo git reset --hard 4e5e9cd5e821f4f19e31e10ba42f20449860b940
-    cd ${dir}
+    cd ${dir_ros1}
 
-    sudo git clone https://github.com/astuff/kvaser_interface.git ${dir}/src/kvaser_interface --branch ros1_master
-    cd ${dir}/src/kvaser_interface
+    sudo git clone https://github.com/astuff/kvaser_interface.git ${dir_ros1}/src/kvaser_interface --branch ros1_master
+    cd ${dir_ros1}/src/kvaser_interface
     sudo git reset --hard e2aa169e32577f2468993b89edf7a0f67d1e7f0e
-    cd ${dir}
+    cd ${dir_ros1}
 fi
 
 if [ $build_ros2_pkgs -eq 1 ]; then
     sudo git clone https://github.com/NewEagleRaptor/raptor-dbw-ros2.git ./src/raptor-dbw-ros2 --branch foxy
-    cd ${dir}/src/raptor-dbw-ros2
+    cd ${dir_ros2}/src/raptor-dbw-ros2
     sudo git reset --hard 4ad958dd07bb9c7128dc75bc7397bc8f5be30a3c
-    cd ${dir}
+    cd ${dir_ros2}
 
     # TO DO: Add ros2 version for Ford fusion drive by wire
     # Required for ford fusion drive by wire
-    # sudo git clone https://bitbucket.org/DataspeedInc/dbw_mkz_ros.git ${dir}/src/dbw-mkz-ros --branch 1.2.4
+    # sudo git clone https://bitbucket.org/DataspeedInc/dbw_mkz_ros.git ${dir_ros2}/src/dbw-mkz-ros --branch 1.2.4
 
     #Pacmod3
     sudo git clone https://github.com/astuff/pacmod3.git ./src/pacmod3_ros2 --branch ros2_master
     cd ./src/pacmod3_ros2
     sudo git reset --hard 159ef36f26726cf8d7f58e67add8c8319a67ae85
-    cd ${dir}
+    cd ${dir_ros2}
 
     # kvaser
-    sudo git clone https://github.com/astuff/kvaser_interface.git ${dir}/src/kvaser_interface --branch ros2_master
+    sudo git clone https://github.com/astuff/kvaser_interface.git ${dir_ros2}/src/kvaser_interface --branch ros2_master
     cd ./src/kvaser_interface
     sudo git reset --hard d7ea2fb82a1b61d0ce4c96d1422599f7ee6ed1b7
-    cd ${dir}
+    cd ${dir_ros2}
 
     # Install automotive_autonomy_msgs
-    sudo git clone https://github.com/astuff/automotive_autonomy_msgs.git ${dir}/src/automotive_autonomy_msgs --branch master
+    sudo git clone https://github.com/astuff/automotive_autonomy_msgs.git ${dir_ros2}/src/automotive_autonomy_msgs --branch master
     cd ./src/automotive_autonomy_msgs
     sudo git reset --hard 191dce1827023bef6d69b31e8c2514cf82bf10c5
-    cd ${dir}
+    cd ${dir_ros2}
 fi