Reuse output as env

precice · Mar 20, 2024 · 8012fd9 · 8012fd9
1 parent f939c7a
commit 8012fd9
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/.github/workflows/build-custom.yml b/.github/workflows/build-custom.yml
@@ -89,45 +89,44 @@ jobs:
           OpenFOAMv2312)
             wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash
             sudo apt-get install openfoam2312-dev
-            ln -s /usr/bin/openfoam2312 openfoam_exec;;
+            echo "{openfoam_exec}={/usr/bin/openfoam2312}" >> $GITHUB_OUTPUT;;
           OpenFOAMv2306)
             wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash
             sudo apt-get install openfoam2306-dev
-            ln -s /usr/bin/openfoam2306 openfoam_exec;;
+            echo "{openfoam_exec}={/usr/bin/openfoam2306}" >> $GITHUB_OUTPUT;;
           OpenFOAMv2212)
             wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash
             sudo apt-get install openfoam2212-dev
-            ln -s /usr/bin/openfoam2212 openfoam_exec;;
+            echo "{openfoam_exec}={/usr/bin/openfoam2212}" >> $GITHUB_OUTPUT;;
           OpenFOAMv2206)
             wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash
             sudo apt-get install openfoam2206-dev
-            ln -s /usr/bin/openfoam2206 openfoam_exec;;
+            echo "{openfoam_exec}={/usr/bin/openfoam2206}" >> $GITHUB_OUTPUT;;
           OpenFOAMv2112)
             wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash
             sudo apt-get install openfoam2112-dev
-            ln -s /usr/bin/openfoam2112 openfoam_exec;;
+            echo "{openfoam_exec}={/usr/bin/openfoam2112}" >> $GITHUB_OUTPUT;;
           OpenFOAMv2106)
             wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash
             sudo apt-get install openfoam2106-dev
-            ln -s /usr/bin/openfoam2106 openfoam_exec;;
+            echo "{openfoam_exec}={/usr/bin/openfoam2106}" >> $GITHUB_OUTPUT;;
           OpenFOAMv2012)
             wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash
             sudo apt-get install openfoam2012-dev
-            ln -s /usr/bin/openfoam2012 openfoam_exec;;
+            echo "{openfoam_exec}={/usr/bin/openfoam2012}" >> $GITHUB_OUTPUT;;
           OpenFOAMv2006)
             wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash
             sudo apt-get install openfoam2006-dev
-            ln -s /usr/bin/openfoam2006 openfoam_exec;;
+            echo "{openfoam_exec}={/usr/bin/openfoam2006}" >> $GITHUB_OUTPUT;;
           OpenFOAMv1912)
             wget -q -O - https://dl.openfoam.com/add-debian-repo.sh | sudo bash
             sudo apt-get install openfoam1912-dev
-            ln -s /usr/bin/openfoam1912 openfoam_exec;;
+            echo "{openfoam_exec}={/usr/bin/openfoam1912}" >> $GITHUB_OUTPUT;;
           OpenFOAM10)
             sudo sh -c "wget -O - https://dl.openfoam.org/gpg.key | apt-key add -"
             sudo add-apt-repository http://dl.openfoam.org/ubuntu
             sudo apt-get update
             sudo apt-get -y install openfoam10
-            # Output of such variables seems to currently be broken in GitHub Actions
             echo "{openfoam_exec}={. /opt/openfoam10/etc/bashrc &&}" >> $GITHUB_OUTPUT;;
           OpenFOAM9)
             sudo sh -c "wget -O - https://dl.openfoam.org/gpg.key | apt-key add -"
@@ -166,8 +165,11 @@ jobs:
             exit 1;;
         esac
     - name: Build OpenFOAM-preCICE adapter
+      env:
+        OPENFOAM_EXEC: ${{steps.installOpenFOAM.outputs.openfoam_exec}}
       run: |
-          ./openfoam_exec ./Allwmake
+          echo "OpenFOAM environment: $OPENFOAM_EXEC"
+          $OPENFOAM_EXEC ./Allwmake
     - name: Get tutorials
       run: |
         git clone https://github.com/precice/tutorials.git --branch ${{ github.event.inputs.branchTutorials }} --depth 1