Skip to content

Commit 592ca27

Browse files
committed
Remove workarounds in Windows build
1 parent 37ad542 commit 592ca27

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,19 @@ jobs:
9393
powershell
9494
9595
# The Fortran conda compiler, flang, needs to be set over the gfortran installed by chocolatety.
96-
- name: Set the FC environment variable
97-
run: |
98-
echo "FC=$env:CONDA_PREFIX\Library\bin\flang-new.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
96+
# - name: Set the FC environment variable
97+
# run: |
98+
# echo "FC=$env:CONDA_PREFIX\Library\bin\flang-new.exe" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
9999

100100
# A link.exe installed by chocolatey was ahead of the MSVC link.exe in the path.
101-
- name: Remove link.exe in the Git install
102-
run: |
103-
Remove-Item -Path "C:\Program Files\Git\usr\bin\link.exe" -Force
101+
# - name: Remove link.exe in the Git install
102+
# run: |
103+
# Remove-Item -Path "C:\Program Files\Git\usr\bin\link.exe" -Force
104104

105105
# The flang FortranRuntime.lib wasn't being found. This recommendation comes from the Meson docs.
106-
- name: Add conda environment libpath to Windows LIB (not LIBPATH)
107-
run: |
108-
echo "LIB=$env:LIB;$env:CONDA_PREFIX\Library\lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
106+
# - name: Add conda environment libpath to Windows LIB (not LIBPATH)
107+
# run: |
108+
# echo "LIB=$env:LIB;$env:CONDA_PREFIX\Library\lib" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
109109

110110
- name: View environment variables
111111
run: |

0 commit comments

Comments
 (0)