From 63331c9d889c8b5819795e479b9872bc2b7ee957 Mon Sep 17 00:00:00 2001
From: David Conner <robotics@cnu.edu>
Date: Tue, 4 Jun 2024 12:11:40 -0400
Subject: [PATCH] move to vcs tool for jazzy

---
 ci_scripts/before_script.bash  | 8 +++-----
 ci_scripts/run_rosinstall.bash | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/ci_scripts/before_script.bash b/ci_scripts/before_script.bash
index a3909bd..60f4e2d 100644
--- a/ci_scripts/before_script.bash
+++ b/ci_scripts/before_script.bash
@@ -2,15 +2,13 @@
 set -e
 
 # clone required packages
-cd ~/colcon_ws/src
-wstool init
+cd ~/colcon_ws
 for rosinstall in ~/flexbe_ci/rosinstall/*.rosinstall; do
     if [ "$(basename $rosinstall .rosinstall)" == "$BASE_REPO" ]; then
         ln -s $BASE_PATH ~/colcon_ws/src/$BASE_REPO
     else
-        wstool merge $rosinstall
+        vcs import src < $rosinstall --workers=1
     fi
 done
-wstool up
-cd ~/colcon_ws
+vcs pull src
 rosdep install -y --from-paths src --ignore-src --rosdistro=${ROS_DISTRO}
diff --git a/ci_scripts/run_rosinstall.bash b/ci_scripts/run_rosinstall.bash
index 029f474..e9ddec9 100644
--- a/ci_scripts/run_rosinstall.bash
+++ b/ci_scripts/run_rosinstall.bash
@@ -2,8 +2,7 @@
 set -e
 
 # clone required packages
-cd ~/colcon_ws/src
-wstool init
+cd ~/colcon_ws
 for rosinstall in ~/flexbe_ci/rosinstall/*.rosinstall; do
     REPO_INFO=(${GITHUB_REPOSITORY//\// })
     REPO_NAME=${REPO_INFO[1]}
@@ -12,11 +11,10 @@ for rosinstall in ~/flexbe_ci/rosinstall/*.rosinstall; do
         ln -s $GITHUB_WORKSPACE ~/colcon_ws/src/$REPO_NAME
     else
         echo "[REPO:$rosinstall] Cloning via rosinstall"
-        wstool merge $rosinstall
+        vcs import src < $rosinstall --workers=1
     fi
 done
-wstool up
-cd ~/colcon_ws
+vcs pull src
 rosdep install -y --from-paths src --ignore-src --rosdistro=${ROS_DISTRO}
 
 source /opt/ros/$ROS_DISTRO/setup.bash