Try populating a different way

mrmundt · Jan 8, 2025 · 4ec366a · 4ec366a
1 parent 254e2dc
commit 4ec366a
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/.github/workflows/test_branches.yml b/.github/workflows/test_branches.yml
@@ -440,7 +440,8 @@ jobs:
       run: |
         IPOPT_DIR=$TPL_DIR/ipopt
         echo "$IPOPT_DIR" >> $GITHUB_PATH
-        echo "PYOMO_PATH=$IPOPT_DIR:$PYOMO_PATH" >> $$GITHUB_ENV
+        NEW_PYOMO_PATH="$IPOPT_DIR:$PYOMO_PATH"
+        echo "PYOMO_PATH=$NEW_PYOMO_PATH" >> $$GITHUB_ENV
         echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$IPOPT_DIR" >> $GITHUB_ENV
         mkdir -p $IPOPT_DIR
         IPOPT_TAR=${DOWNLOAD_DIR}/ipopt.tar.gz
@@ -490,8 +491,6 @@ jobs:
             Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         echo "DYLD_LIBRARY_PATH=${env:DYLD_LIBRARY_PATH}:$GAMS_DIR" `
             Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-        echo "PYOMO_PATH=${env:GAMS_DIR}:${env:PYOMO_PATH}" `
-            Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
         $INSTALLER = "${env:DOWNLOAD_DIR}/gams_install.exe"
         # We are pinning to 29.1.0 because a license is required for
         # versions after this in order to run in demo mode.
@@ -529,7 +528,9 @@ jobs:
     - name: Install GAMS Python bindings
       if: ${{ ! matrix.slim }}
       run: |
-        GAMS_DIR="${env:TPL_DIR}/gams"
+        GAMS_DIR="$TPL_DIR/gams"
+        NEW_PYOMO_PATH="$GAMS_DIR:$PYOMO_PATH"
+        echo "PYOMO_PATH=$NEW_PYOMO_PATH" >> $$GITHUB_ENV
         py_ver=$($PYTHON_EXE -c 'import sys;v="_%s%s" % sys.version_info[:2] \
             ;print(v if v != "_27" else "")')
         if test -e $GAMS_DIR/apifiles/Python/api$py_ver; then
@@ -550,9 +551,10 @@ jobs:
       shell: pwsh
       run: |
         $BARON_DIR = "${env:TPL_DIR}/baron"
+        $NEW_PYOMO_PATH = "$BARON_DIR:${env:PYOMO_PATH}"
         echo "$BARON_DIR" | `
             Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        echo "PYOMO_PATH=${env:BARON_DIR}:${env: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" ) {
@@ -591,7 +593,8 @@ jobs:
       run: |
         GJH_DIR="$TPL_DIR/gjh"
         echo "${GJH_DIR}" >> $GITHUB_PATH
-        echo "PYOMO_PATH=$GJH_DIR:$PYOMO_PATH" >> $$GITHUB_ENV
+        NEW_PYOMO_PATH="$GJH_DIR:$PYOMO_PATH"
+        echo "PYOMO_PATH=$NEW_PYOMO_PATH" >> $$GITHUB_ENV
         INSTALL_DIR="${DOWNLOAD_DIR}/gjh"
         if test ! -e "$INSTALL_DIR/bin"; then
             mkdir -p "$INSTALL_DIR"