@@ -84,43 +84,26 @@ jobs:
8484 init-shell : >-
8585 powershell
8686
87- # - name: Set the PREFIX environment variable
88- # run: |
89- # echo "PREFIX=$env:MAMBA_ROOT_PREFIX\envs\fbld\Library" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
90-
87+ # The Fortran conda compiler, flang, needs to be set over the gfortran installed by chocolatety.
9188 - name : Set the FC environment variable
9289 run : |
9390 echo "FC=$env:CONDA_PREFIX\Library\bin\flang-new.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
9491
95- # - name: Make a LINKER environment variable
96- # run: |
97- # echo "LINKER=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform\link.exe" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
98-
99- # - name: Make a LINK_DIR environment variable for MSVC link.exe
100- # run: |
101- # echo "LINK_DIR=$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
102-
103- # - name: Push location of MSVC link.exe to the front of the path
104- # run: |
105- # echo "Path=$env:LINK_DIR;$env:Path" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
106-
107- # - name: Force location of MSVC link.exe to the front of the path
108- # run: |
109- # echo "$env:VCToolsInstallDir\bin\Host$env:RUNNER_ARCH\$env:Platform" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
110-
92+ # A link.exe installed by chocolatey was ahead of the MSVC link.exe in the path.
11193 - name : Remove link.exe in the Git install
11294 run : |
11395 Remove-Item -Path "C:\Program Files\Git\usr\bin\link.exe" -Force
11496
97+ # The flang FortranRuntime.lib wasn't being found. This recommendation comes from the Meson docs.
11598 - name : Add conda environment libpath to Windows LIB (not LIBPATH)
11699 run : |
117100 echo "LIB=$env:LIB;$env:CONDA_PREFIX\Library\lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
118101
119102 - name : View environment variables
120103 run : |
121104 ls env:
122- ls env:LIB
123105
106+ # The install prefix must be quoted.
124107 - name : Configure, build, and install HeatModelF
125108 run : |
126109 pushd ./external/bmi-example-fortran
@@ -138,6 +121,7 @@ jobs:
138121 python -c 'import pymt_heatf'
139122 python -c 'from pymt.models import HeatModelF'
140123
124+ # Weird Windows stuff here. If the examples in the next step run to completion, the BMI works.
141125 # - name: Test BMI
142126 # working-directory: ${{ github.workspace }}
143127 # run: |
0 commit comments