Skip to content

Commit ccf6a65

Browse files
authored
Update cmake.yml due to fortran-lang/setup-fortran#58
1 parent be34d28 commit ccf6a65

File tree

1 file changed

+1
-11
lines changed

1 file changed

+1
-11
lines changed

.github/workflows/cmake.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -134,22 +134,12 @@ jobs:
134134
if: ${{ matrix.toolchain.cc }}
135135
run: echo "CC=${{ matrix.toolchain.cc }}" >> $env:GITHUB_ENV
136136

137-
# gcc 12 is installed on windows runners by default. setup-fortran moves gfortran, gcc, and g++ to a temp directory
138-
# so that they do not get picked up by CMake, but it doesn't move libgfortran-5.dll, and because /c/mingw64/bin is
139-
# on the path ahead of /c/ProgramData/chocolatey/bin (setup-fortran uses chocolatey to install gcc11), the programs
140-
# that are compiled with gcc11 try to use libgfortran-5.dll from gcc12 and crash. For now we rename the gcc12 version
141-
# of libgfortran-5.dll so that the programs pick up the correct version in chocolatey/bin
142-
- name: Move libgfortran-5.dll for gcc11 windows
143-
if: ${{ matrix.os == 'windows-latest' && matrix.toolchain.compiler == 'gcc' && matrix.toolchain.version == '11' }}
144-
run: mv /c/mingw64/bin/libgfortran-5.dll /c/mingw64/bin/libgfortran-5.dll.old
145-
shell: bash
146-
147137
- name: Build
148138
run: |
149139
cmake --version
150140
cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_PREFIX=. -LAH -DCMAKE_C_FLAGS="${{ matrix.toolchain.cflags }}" -DCMAKE_Fortran_FLAGS="${{ matrix.toolchain.fflags }}" .
151141
cmake --build . --target install
152-
cmake --build . --target tests
142+
cmake --build . --target test】s
153143
ctest --output-on-failure -V -E stress
154144
env:
155145
FC: ${{ steps.setup-fortran.outputs.fc }}

0 commit comments

Comments
 (0)