Skip to content

Commit 39df36b

Browse files
committed
Install fypp from msys2 package, clean up file
1 parent c74a30e commit 39df36b

File tree

1 file changed

+2
-22
lines changed

1 file changed

+2
-22
lines changed

.github/workflows/ci_windows.yml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ jobs:
2424
steps:
2525
- uses: actions/checkout@v2
2626

27-
- name: Setup MinGW native environment
27+
- name: Setup environment
2828
uses: msys2/setup-msys2@v2
29-
if: contains(matrix.msystem, 'MINGW')
3029
with:
3130
msystem: ${{ matrix.msystem }}
3231
update: false
@@ -35,29 +34,10 @@ jobs:
3534
mingw-w64-${{ matrix.arch }}-gcc
3635
mingw-w64-${{ matrix.arch }}-gcc-fortran
3736
mingw-w64-${{ matrix.arch }}-python
38-
mingw-w64-${{ matrix.arch }}-python-pip
39-
mingw-w64-${{ matrix.arch }}-python-setuptools
37+
mingw-w64-${{ matrix.arch }}-python-fypp
4038
mingw-w64-${{ matrix.arch }}-cmake
4139
mingw-w64-${{ matrix.arch }}-ninja
4240
43-
- name: Setup msys POSIX environment
44-
uses: msys2/setup-msys2@v2
45-
if: contains(matrix.msystem, 'MSYS')
46-
with:
47-
msystem: MSYS
48-
update: false
49-
install: >-
50-
git
51-
mingw-w64-x86_64-gcc
52-
mingw-w64-x86_64-gcc-fortran
53-
python
54-
python-pip
55-
cmake
56-
ninja
57-
58-
- name: Install fypp
59-
run: pip install fypp
60-
6141
- run: >-
6242
PATH=$PATH:/mingw64/bin/ cmake
6343
-Wdev

0 commit comments

Comments
 (0)