Export ROSDISTRO_INDEX_URL as well if ROSDEP_SOURCES_VERSION is set

ros-industrial · Mar 29, 2024 · 38d3fba · 38d3fba
1 parent 39c1aa2
commit 38d3fba
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/industrial_ci/src/workspace.sh b/industrial_ci/src/workspace.sh
@@ -329,14 +329,17 @@ function ici_setup_rosdep {
     if ! [ -d /etc/ros/rosdep/sources.list.d ]; then
         ici_cmd ici_quiet ici_asroot rosdep init
     fi
-    if [ -n "$ROSDEP_SOURCES_VERSION" ]; then
-        ici_cmd ici_quiet ici_asroot sed -E -i "s;(https://raw.githubusercontent.com/ros/rosdistro/)master;\1$ROSDEP_SOURCES_VERSION;g" /etc/ros/rosdep/sources.list.d/*.list
-    fi
-
     update_opts=()
     if [ -z "${ROSDISTRO_INDEX_URL:-}" ]; then
         update_opts+=(--rosdistro "$ROS_DISTRO")
     fi
+    if [ -n "$ROSDEP_SOURCES_VERSION" ]; then
+        ici_cmd ici_quiet ici_asroot sed -E -i "s;(https://raw.githubusercontent.com/ros/rosdistro/)master;\1$ROSDEP_SOURCES_VERSION;g" /etc/ros/rosdep/sources.list.d/*.list
+        if [ -z "${ROSDISTRO_INDEX_URL:-}" ]; then
+            export ROSDISTRO_INDEX_URL=https://raw.githubusercontent.com/ros/rosdistro/$ROS_DISTRO/$ROSDEP_SOURCES_VERSION/index-v4.yaml
+        fi
+    fi
+
     if [ "$ROS_VERSION_EOL" = true ]; then
         update_opts+=(--include-eol-distros)
     fi