From 13a7238e18c126b73a85b8dce3300ffcd4181cba Mon Sep 17 00:00:00 2001
From: Miranda Mundt <mmundt@sandia.gov>
Date: Wed, 8 Jan 2025 11:25:48 -0700
Subject: [PATCH] Try reworking BARON again

---
 .github/workflows/test_branches.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml
index aa8adfc371f..f1ec6df1cdc 100644
--- a/.github/workflows/test_branches.yml
+++ b/.github/workflows/test_branches.yml
@@ -553,6 +553,9 @@ jobs:
         $BARON_DIR = "${env:TPL_DIR}/baron"
         echo "$BARON_DIR" | `
             Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+        $NEW_PYOMO_PATH = "$BARON_DIR;$PYOMO_PATH"
+        echo "PYOMO_PATH=$NEW_PYOMO_PATH" | `
+            Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         $URL = "https://minlp-downloads.nyc3.cdn.digitaloceanspaces.com/xecs/baron/current/"
         if ( "${{matrix.TARGET}}" -eq "win" ) {
             $INSTALLER = "${env:DOWNLOAD_DIR}/baron_install.exe"
@@ -589,13 +592,7 @@ jobs:
       if: ${{ ! matrix.slim && matrix.TARGET != 'win' }}
       run: |
         GJH_DIR="$TPL_DIR/gjh"
-        BARON_DIR="$TPL_DIR/baron"
-        echo "Current PYOMO_PATH..."
-        echo "$PYOMO_PATH"
-        export NEW_PYOMO_PATH="$BARON_DIR:$PYOMO_PATH"
         NEW_PYOMO_PATH="$GJH_DIR:$NEW_PYOMO_PATH"
-        echo "New PYOMO_PATH..."
-        echo "$NEW_PYOMO_PATH"
         echo "PYOMO_PATH=$NEW_PYOMO_PATH" >> $GITHUB_ENV
         echo "${GJH_DIR}" >> $GITHUB_PATH
         INSTALL_DIR="${DOWNLOAD_DIR}/gjh"