Skip to content

Commit b752daa

Browse files
committed
ci: windows needs msys2 for fortran
1 parent 3746cce commit b752daa

File tree

1 file changed

+9
-32
lines changed

1 file changed

+9
-32
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ env:
44
cmake_version: '3.23.2'
55
ninja_version: '1.11.0'
66
HOMEBREW_NO_INSTALL_CLEANUP: 1
7-
CMAKE_GENERATOR: Ninja
87

98
on:
109
push:
@@ -17,14 +16,13 @@ on:
1716

1817
jobs:
1918

20-
core:
19+
unix:
2120

2221
strategy:
2322
matrix:
2423
cfg: [
2524
{os: ubuntu-latest, fc: gfortran},
26-
{os: macos-latest, fc: gfortran-11},
27-
{os: windows-latest, fc: gfortran}
25+
{os: macos-latest, fc: gfortran-11}
2826
]
2927

3028
env:
@@ -35,19 +33,14 @@ jobs:
3533
steps:
3634
- uses: actions/checkout@v2
3735

38-
<<<<<<< HEAD
39-
- name: Install CMake
40-
run: cmake -S install_cmake -Dversion="${{ env.cmake_version }}" -DCMAKE_INSTALL_PREFIX:PATH=${{ runner.temp }}
41-
=======
4236
- name: Install Ninja
43-
run: cmake -S install_ninja -B ${{ runner.temp }}/install_ninja -Dversion="${{ env.ninja_version }}" -DCMAKE_INSTALL_PREFIX:PATH=${{ runner.temp }}
37+
run: cmake -S install_ninja -B ${{ runner.temp }}/ninja -Dversion="${{ env.ninja_version }}" -DCMAKE_INSTALL_PREFIX:PATH=${{ runner.temp }}
4438

4539
- name: Ninja path (unix)
46-
run: echo "${{ runner.temp }}/ninja-${{ env.ninja_version }}" >> $GITHUB_PATH
40+
run: echo "${{ runner.temp }}/ninja" >> $GITHUB_PATH
4741

4842
- name: Install CMake
49-
run: cmake -S install_cmake -B ${{ runner.temp }}/install_cmake -Dversion="${{ env.cmake_version }}" -DCMAKE_INSTALL_PREFIX:PATH=${{ runner.temp }}
50-
>>>>>>> 9494849 (f)
43+
run: cmake -S install_cmake -B ${{ runner.temp }}/cmake -Dversion="${{ env.cmake_version }}" -DCMAKE_INSTALL_PREFIX:PATH=${{ runner.temp }}
5144

5245
- name: CMake path (Linux)
5346
if: runner.os == 'linux'
@@ -57,8 +50,6 @@ jobs:
5750
if: runner.os == 'macos'
5851
run: echo "${{ runner.temp }}/cmake-${{ env.cmake_version }}-macos-universal/bin" >> $GITHUB_PATH
5952

60-
<<<<<<< HEAD
61-
=======
6253
- run: cmake --version
6354

6455
- run: cmake -G Ninja -B build --install-prefix=${HOME}
@@ -82,34 +73,20 @@ jobs:
8273
- uses: actions/checkout@v2
8374

8475
- name: Install Ninja
85-
run: cmake -S install_ninja -B ${{ runner.temp }}/install_ninja -Dversion="${{ env.ninja_version }}" -DCMAKE_INSTALL_PREFIX:PATH=${{ runner.temp }}
76+
run: cmake -S install_ninja -B ${{ runner.temp }}/ninja -Dversion="${{ env.ninja_version }}" -DCMAKE_INSTALL_PREFIX:PATH=${{ runner.temp }}
8677

8778
- name: Ninja path (Windows)
88-
run: echo "${{ runner.temp }}/ninja-${{ env.ninja_version }}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
79+
run: echo "${{ runner.temp }}/ninja" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
8980

9081
- name: Install CMake
91-
run: cmake -S install_cmake -B ${{ runner.temp }}/install_cmake -Dversion="${{ env.cmake_version }}" -DCMAKE_INSTALL_PREFIX:PATH=${{ runner.temp }}
82+
run: cmake -S install_cmake -B ${{ runner.temp }}/cmake -Dversion="${{ env.cmake_version }}" -DCMAKE_INSTALL_PREFIX:PATH=${{ runner.temp }}
9283

93-
>>>>>>> 9494849 (f)
9484
- name: CMake path (Windows)
95-
if: runner.os == 'windows'
9685
run: echo "${{ runner.temp }}/cmake-${{ env.cmake_version }}-windows-x86_64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
9786

98-
- name: Install Ninja
99-
run: cmake -S install_ninja -Dversion="${{ env.ninja_version }}" -DCMAKE_INSTALL_PREFIX:PATH=${{ runner.temp }}
100-
101-
- name: Ninja path (unix)
102-
if: runner.os == 'linux' || runner.os == 'macos'
103-
run: echo "${{ runner.temp }}/ninja-${{ env.ninja_version }}" >> $GITHUB_PATH
104-
105-
- name: Ninja path (Windows)
106-
if: runner.os == 'windows'
107-
run: echo "${{ runner.temp }}/ninja-${{ env.ninja_version }}" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
108-
109-
11087
- run: cmake --version
11188

112-
- run: cmake -B build --install-prefix=${HOME}
89+
- run: cmake -G Ninja -B build --install-prefix=${HOME}
11390
- run: cmake --build build
11491
- run: ctest --test-dir build --preset default
11592

0 commit comments

Comments
 (0)