From 74f070e137137bbb186b038d763adb732962b6ad Mon Sep 17 00:00:00 2001
From: Michael Ripperger <michael.ripperger@swri.org>
Date: Thu, 9 Nov 2023 10:16:55 -0600
Subject: [PATCH] Revert "Changed CI base directory to /opt"

This reverts commit 9377b1d5d9d4dfe9d07dc45e3f532b0295911a1d.
---
 .github/workflows/ubuntu.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 570f4aac5e6..d152d05f3e1 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -88,17 +88,16 @@ jobs:
           ADDITIONAL_DEBS: 'taskflow libompl-dev'
           ROS_DISTRO: false
           DOCKER_IMAGE: ${{ env.REGISTRY }}/tesseract-robotics/tesseract:${{ matrix.distro }}-${{ env.TESSERACT_VERSION }}
+          UNDERLAY: /root/tesseract-robotics/tesseract_target_ws/install
           CCACHE_DIR: ${{ github.workspace }}/${{ matrix.distro }}/.ccache
-          BASEDIR: /opt
           PREFIX: ${{ github.repository }}_
-          UNDERLAY: ${BASEDIR}/tesseract-robotics/tesseract_target_ws/install
           BEFORE_INIT: './.github/workflows/add_sources.sh'
           AFTER_INIT: ''
           UPSTREAM_WORKSPACE: dependencies.repos
           UPSTREAM_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Release"
           ROSDEP_SKIP_KEYS: "fcl opw_kinematics ros_industrial_cmake_boilerplate iwyu octomap catkin ompl taskflow descartes_light trajopt trajopt_ifopt trajopt_sco trajopt_sqp ruckig"
           TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DTESSERACT_ENABLE_TESTING=ON -DTESSERACT_WARNINGS_AS_ERRORS=OFF"
-          AFTER_SCRIPT: 'rm -r ${BASEDIR}/${PREFIX}upstream_ws/build ${BASEDIR}/${PREFIX}target_ws/build'
+          AFTER_SCRIPT: 'rm -r $BASEDIR/${PREFIX}upstream_ws/build $BASEDIR/${PREFIX}target_ws/build'
           DOCKER_COMMIT: ${{ steps.meta.outputs.tags }}
 
       - name: Push post-build Docker