From 5f5d75fb19df2a1d8014d20e3e7ef65cea9a3010 Mon Sep 17 00:00:00 2001
From: Levi Armstrong <levi.armstrong@gmail.com>
Date: Thu, 9 Nov 2023 13:08:04 -0600
Subject: [PATCH] fixup

---
 .github/workflows/ubuntu_test.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ubuntu_test.yml b/.github/workflows/ubuntu_test.yml
index 2d0e321c68e..b6c587153b8 100644
--- a/.github/workflows/ubuntu_test.yml
+++ b/.github/workflows/ubuntu_test.yml
@@ -39,6 +39,7 @@ jobs:
       - name: Install Depends
         shell: bash
         run: |
+          echo "GITHUB_WORKSPACE=$GITHUB_WORKSPACE" >> $GITHUB_ENV
           apt update
           apt upgrade -y
           apt install -y cmake curl lsb-release ca-certificates gnupg python3 python3-distutils python3-pip ccache
@@ -73,29 +74,29 @@ jobs:
       - name: Build Upstream Workspace
         shell: bash
         run: |
-          cd ${{ github.workspace }}/target_ws/src
+          cd ${{ env.GITHUB_WORKSPACE }}/target_ws/src
           ls -la
-          .${{ github.workspace }}/target_ws/src/.github/workflows/add_ros_apt_sources.sh
+          .${{ env.GITHUB_WORKSPACE }}/target_ws/src/.github/workflows/add_ros_apt_sources.sh
           apt install -y liboctomap-dev libfcl-dev libconsole-bridge-dev libbullet-dev libbullet-extras-dev libyaml-cpp-dev libtinyxml2-dev libassimp-dev liborocos-kdl-dev libpcl-dev liblapack-dev libboost-dev libboost-filesystem-dev libboost-serialization-dev libboost-program-options-dev libboost-graph-dev libbenchmark-dev libccd-dev libgtest-dev
           mkdir -p ${{ github.workspace }}/upstream_ws/src
-          vcs import --input "dependencies.repos" ${{ github.workspace }}/upstream_ws/src/
-          cd ${{ github.workspace }}/upstream_ws
+          vcs import --input "dependencies.repos" ${{ env.GITHUB_WORKSPACE }}/upstream_ws/src/
+          cd ${{ env.GITHUB_WORKSPACE }}/upstream_ws
           colcon build --event-handlers console_direct+ --cmake-args -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Release
 
       - name: Build Target Workspace
         shell: bash
         run: |
-          cd ${{ github.workspace }}/target_ws/src
+          cd ${{ env.GITHUB_WORKSPACE }}/target_ws/src
           ls
-          source ${{ github.workspace }}/upstream_ws/install/setup.bash
+          source ${{ env.GITHUB_WORKSPACE }}/upstream_ws/install/setup.bash
           colcon build --event-handlers console_direct+ --cmake-args -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Release -DTESSERACT_ENABLE_TESTING=ON
           if [ $? -ge 1 ]; then return 1; fi
 
       - name: Run Tests
         shell: bash
         run: |
-          cd ${{ github.workspace }}/target_ws
-          source ${{ github.workspace }}/target_ws/install/setup.bash
+          cd ${{ env.GITHUB_WORKSPACE }}/target_ws
+          source ${{ env.GITHUB_WORKSPACE }}/target_ws/install/setup.bash
           colcon test --event-handlers console_direct+ --return-code-on-test-failure
           if [ $? -ge 1 ]; then return 1; fi
           colcon test-result --verbose