Skip to content

Commit d3ae5a7

Browse files
authored
Merge branch 'fortran-lang:master' into qr
2 parents df4016a + 1d27d27 commit d3ae5a7

File tree

1 file changed

+1
-22
lines changed

1 file changed

+1
-22
lines changed

.github/workflows/ci_windows.yml

+1-22
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
include: [
16-
{ msystem: MSYS, arch: x86_64 },
1716
{ msystem: MINGW64, arch: x86_64 },
1817
{ msystem: MINGW32, arch: i686 }
1918
]
@@ -25,7 +24,6 @@ jobs:
2524

2625
- name: Setup MinGW native environment
2726
uses: msys2/setup-msys2@v2
28-
if: contains(matrix.msystem, 'MINGW')
2927
with:
3028
msystem: ${{ matrix.msystem }}
3129
update: false
@@ -34,29 +32,10 @@ jobs:
3432
mingw-w64-${{ matrix.arch }}-gcc
3533
mingw-w64-${{ matrix.arch }}-gcc-fortran
3634
mingw-w64-${{ matrix.arch }}-python
37-
mingw-w64-${{ matrix.arch }}-python-pip
38-
mingw-w64-${{ matrix.arch }}-python-setuptools
35+
mingw-w64-${{ matrix.arch }}-python-fypp
3936
mingw-w64-${{ matrix.arch }}-cmake
4037
mingw-w64-${{ matrix.arch }}-ninja
4138
42-
- name: Setup msys POSIX environment
43-
uses: msys2/setup-msys2@v2
44-
if: contains(matrix.msystem, 'MSYS')
45-
with:
46-
msystem: MSYS
47-
update: false
48-
install: >-
49-
git
50-
mingw-w64-x86_64-gcc
51-
mingw-w64-x86_64-gcc-fortran
52-
python
53-
python-pip
54-
cmake
55-
ninja
56-
57-
- name: Install fypp
58-
run: pip install fypp
59-
6039
- run: >-
6140
PATH=$PATH:/mingw64/bin/ cmake
6241
-Wdev

0 commit comments

Comments
 (0)