From 106f8a71c3c09414817de58c3b8628c63e81efa0 Mon Sep 17 00:00:00 2001
From: Mateusz Szczygielski <mateusz.szczygielski@robotec.ai>
Date: Mon, 10 Jun 2024 15:37:13 +0200
Subject: [PATCH] Use ROS_DISTRO instead of fixed version

---
 .github/workflows/build-and-test.yml   | 8 ++++----
 .github/workflows/test-subworkflow.yml | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index e3c672daa..2e516b454 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -62,7 +62,7 @@ jobs:
       - run: '
         docker build --build-context optix=${{ needs.load-env.outputs.optix-install-dir }}
         --build-arg WITH_PCL=1 --build-arg WITH_ROS2=1
-        --build-arg BUILD_CMD=". /opt/ros/humble/setup.sh && ./setup.py --with-ros2-standalone"
+        --build-arg BUILD_CMD=". /opt/\$ROS_DISTRO/setup.sh && ./setup.py --with-ros2-standalone"
         --target=exporter --output=bin-ros2 .'
 
   build-udp:
@@ -92,7 +92,7 @@ jobs:
       - run: '
         docker build --build-context optix=${{ needs.load-env.outputs.optix-install-dir }}
         --build-arg WITH_PCL=1 --build-arg WITH_ROS2=1
-        --build-arg BUILD_CMD=". /opt/ros/humble/setup.sh && ./setup.py --with-pcl --with-ros2-standalone --with-udp --with-snow --build-taped-test"
+        --build-arg BUILD_CMD=". /opt/\$ROS_DISTRO/setup.sh && ./setup.py --with-pcl --with-ros2-standalone --with-udp --with-snow --build-taped-test"
         --target=exporter --output=bin-all .'
 
 ####### TEST WITH RGL DOCKER IMAGE ######
@@ -120,7 +120,7 @@ jobs:
       # Source ROS2 and radar_msgs, standalone build is tested in prod environment
       # Run tests twice, each for different RMW implementation
       test-command: '
-        . /opt/ros/humble/setup.sh &&
+        . /opt/$ROS_DISTRO/setup.sh &&
         . /opt/rgl/external/radar_msgs/install/setup.sh &&
         cd bin-ros2/bin/test &&
         export RMW_IMPLEMENTATION=rmw_fastrtps_cpp && ./RobotecGPULidar_test &&
@@ -151,7 +151,7 @@ jobs:
       # Set `RGL_TEST_VLP16_CALIB_FILE` for UDP-ROS2 integration test
       # Run tests twice, each for different RMW implementation
       test-command: '
-        . /opt/ros/humble/setup.sh &&
+        . /opt/$ROS_DISTRO/setup.sh &&
         . /opt/rgl/external/radar_msgs/install/setup.sh &&
         export RGL_TEST_VLP16_CALIB_FILE=$(pwd)/extensions/udp/test/resources/Ros2Vlp16Calib.yaml &&
         export RGL_TAPED_TEST_DATA_DIR=$(pwd)/external/rgl_blobs &&
diff --git a/.github/workflows/test-subworkflow.yml b/.github/workflows/test-subworkflow.yml
index 411a8c1d1..318dae373 100644
--- a/.github/workflows/test-subworkflow.yml
+++ b/.github/workflows/test-subworkflow.yml
@@ -26,7 +26,6 @@ jobs:
       options:
         --rm
         --gpus all
-        --workdir /opt/rgl-test # to not overwrite dependencies installed in docker image
     steps:
       - name: test
         run: ${{ inputs.test-command }}