Skip to content

Commit 7eb4d11

Browse files
committed
Revert CI changes all the way
1 parent 833b669 commit 7eb4d11

File tree

1 file changed

+25
-10
lines changed

1 file changed

+25
-10
lines changed

.github/workflows/ci_windows.yml

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ jobs:
2323
shell: msys2 {0}
2424
steps:
2525
- uses: actions/checkout@v2
26-
- name: Setup environment
26+
- name: Setup MinGW native environment
2727
uses: msys2/setup-msys2@v2
28+
if: contains(matrix.msystem, 'MINGW')
2829
with:
2930
msystem: ${{ matrix.msystem }}
3031
update: false
@@ -33,20 +34,34 @@ jobs:
3334
mingw-w64-${{ matrix.arch }}-gcc
3435
mingw-w64-${{ matrix.arch }}-gcc-fortran
3536
mingw-w64-${{ matrix.arch }}-python
36-
mingw-w64-${{ matrix.arch }}-python-fypp
37+
mingw-w64-${{ matrix.arch }}-python-pip
38+
mingw-w64-${{ matrix.arch }}-python-setuptools
3739
mingw-w64-${{ matrix.arch }}-cmake
3840
mingw-w64-${{ matrix.arch }}-ninja
39-
unzip
40-
zip
41-
41+
- name: Setup msys POSIX environment
42+
uses: msys2/setup-msys2@v2
43+
if: contains(matrix.msystem, 'MSYS')
44+
with:
45+
msystem: MSYS
46+
update: false
47+
install: >-
48+
git
49+
mingw-w64-x86_64-gcc
50+
mingw-w64-x86_64-gcc-fortran
51+
python
52+
python-pip
53+
cmake
54+
ninja
55+
- name: Install fypp
56+
run: pip install fypp
4257
- run: >-
4358
PATH=$PATH:/mingw64/bin/ cmake
4459
-Wdev
45-
-B build
46-
-DCMAKE_BUILD_TYPE=Debug
47-
-DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
48-
-DCMAKE_MAXIMUM_RANK:String=4
49-
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
60+
-B build
61+
-DCMAKE_BUILD_TYPE=Debug
62+
-DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
63+
-DCMAKE_MAXIMUM_RANK:String=4
64+
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
5065
env:
5166
FC: gfortran
5267
CC: gcc

0 commit comments

Comments
 (0)