Skip to content

Commit a5e9e38

Browse files
committed
Split setup again and but still install fypp as msys2 package on mingw
1 parent 1fd326c commit a5e9e38

File tree

1 file changed

+21
-1
lines changed

1 file changed

+21
-1
lines changed

.github/workflows/ci_windows.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ jobs:
2323
steps:
2424
- uses: actions/checkout@v2
2525

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
@@ -36,6 +37,25 @@ jobs:
3637
mingw-w64-${{ matrix.arch }}-python-fypp
3738
mingw-w64-${{ matrix.arch }}-cmake
3839
mingw-w64-${{ matrix.arch }}-ninja
40+
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+
56+
- name: Install fypp
57+
if: contains(matrix.msystem, 'MSYS')
58+
run: pip install fypp
3959

4060
- run: >-
4161
PATH=$PATH:/mingw64/bin/ cmake

0 commit comments

Comments
 (0)