From 55a066083046dc4616a620108d4ecaa922a630af Mon Sep 17 00:00:00 2001
From: Christoph Froehlich <christoph.froehlich@ait.ac.at>
Date: Wed, 4 Mar 2026 09:46:03 +0000
Subject: [PATCH] Fix the reusable workflow files for rhel/debian with upstream
 workspace

---
 .github/workflows/reusable-debian-build.yml      | 14 ++++++++++++--
 .github/workflows/reusable-rhel-binary-build.yml | 14 ++++++++++++--
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/reusable-debian-build.yml b/.github/workflows/reusable-debian-build.yml
index 460b023..c207bc8 100644
--- a/.github/workflows/reusable-debian-build.yml
+++ b/.github/workflows/reusable-debian-build.yml
@@ -140,7 +140,12 @@ jobs:
         run: |
           source /opt/ros2_ws/install/setup.bash
           if [[ -n "${{ inputs.upstream_workspace }}" ]]; then
-            source ${{ github.workspace }}/${{ env.upstream_ws }}/install/setup.bash
+            UPSTREAM_SETUP="$GITHUB_WORKSPACE/${{ env.upstream_ws }}/install/setup.bash"
+            if [[ ! -f "$UPSTREAM_SETUP" ]]; then
+              echo "Missing upstream setup script: $UPSTREAM_SETUP" >&2
+              exit 1
+            fi
+            source "$UPSTREAM_SETUP"
           fi
           TARGET_PACKAGES=$(colcon list --names-only | tr '\n' ' ')
           if [[ -z "$TARGET_PACKAGES" ]]; then
@@ -158,7 +163,12 @@ jobs:
         run: |
           source /opt/ros2_ws/install/setup.bash
           if [[ -n "${{ inputs.upstream_workspace }}" ]]; then
-            source ${{ github.workspace }}/${{ env.upstream_ws }}/install/setup.bash
+            UPSTREAM_SETUP="$GITHUB_WORKSPACE/${{ env.upstream_ws }}/install/setup.bash"
+            if [[ ! -f "$UPSTREAM_SETUP" ]]; then
+              echo "Missing upstream setup script: $UPSTREAM_SETUP" >&2
+              exit 1
+            fi
+            source "$UPSTREAM_SETUP"
           fi
           source install/setup.bash
           TARGET_PACKAGES=$(colcon list --names-only | tr '\n' ' ')
diff --git a/.github/workflows/reusable-rhel-binary-build.yml b/.github/workflows/reusable-rhel-binary-build.yml
index de95fdd..8629039 100644
--- a/.github/workflows/reusable-rhel-binary-build.yml
+++ b/.github/workflows/reusable-rhel-binary-build.yml
@@ -146,7 +146,12 @@ jobs:
           source /opt/ros/${{ inputs.ros_distro }}/setup.bash
           source /opt/ros2_ws/install/local_setup.bash
           if [[ -n "${{ inputs.upstream_workspace }}" ]]; then
-            source ${{ github.workspace }}/${{ env.upstream_ws }}/install/setup.bash
+            UPSTREAM_SETUP="$GITHUB_WORKSPACE/${{ env.upstream_ws }}/install/setup.bash"
+            if [[ ! -f "$UPSTREAM_SETUP" ]]; then
+              echo "Missing upstream setup script: $UPSTREAM_SETUP" >&2
+              exit 1
+            fi
+            source "$UPSTREAM_SETUP"
           fi
           TARGET_PACKAGES=$(colcon list --names-only | tr '\n' ' ')
           if [[ -z "$TARGET_PACKAGES" ]]; then
@@ -165,7 +170,12 @@ jobs:
           source /opt/ros/${{ inputs.ros_distro }}/setup.bash
           source /opt/ros2_ws/install/local_setup.bash
           if [[ -n "${{ inputs.upstream_workspace }}" ]]; then
-            source ${{ github.workspace }}/${{ env.upstream_ws }}/install/setup.bash
+            UPSTREAM_SETUP="$GITHUB_WORKSPACE/${{ env.upstream_ws }}/install/setup.bash"
+            if [[ ! -f "$UPSTREAM_SETUP" ]]; then
+              echo "Missing upstream setup script: $UPSTREAM_SETUP" >&2
+              exit 1
+            fi
+            source "$UPSTREAM_SETUP"
           fi
           source install/setup.bash
           TARGET_PACKAGES=$(colcon list --names-only | tr '\n' ' ')