Skip to content

Remove msys from CI and install fypp via msys2 package #854

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 21, 2024
Merged

Remove msys from CI and install fypp via msys2 package #854

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
88f754b
Just re-run CI to show failure
minhqdao Aug 1, 2024
99d31af
Install fypp from msys2 package
minhqdao Aug 1, 2024
6e7cd87
Remove setuptools
minhqdao Aug 1, 2024
1fd326c
Unify environment setup
minhqdao Aug 1, 2024
a5e9e38
Split setup again and but still install fypp as msys2 package on mingw
minhqdao Aug 4, 2024
c2a1b4b
Remove whitespace
minhqdao Aug 4, 2024
eabcae4
Remove msys
minhqdao Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 1 addition & 22 deletions .github/workflows/ci_windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
fail-fast: false
matrix:
include: [
{ msystem: MSYS, arch: x86_64 },
{ msystem: MINGW64, arch: x86_64 },
{ msystem: MINGW32, arch: i686 }
]
Expand All @@ -25,7 +24,6 @@ jobs:

- name: Setup MinGW native environment
uses: msys2/setup-msys2@v2
if: contains(matrix.msystem, 'MINGW')
with:
msystem: ${{ matrix.msystem }}
update: false
Expand All @@ -34,29 +32,10 @@ jobs:
mingw-w64-${{ matrix.arch }}-gcc
mingw-w64-${{ matrix.arch }}-gcc-fortran
mingw-w64-${{ matrix.arch }}-python
mingw-w64-${{ matrix.arch }}-python-pip
mingw-w64-${{ matrix.arch }}-python-setuptools
mingw-w64-${{ matrix.arch }}-python-fypp
mingw-w64-${{ matrix.arch }}-cmake
mingw-w64-${{ matrix.arch }}-ninja

- name: Setup msys POSIX environment
uses: msys2/setup-msys2@v2
if: contains(matrix.msystem, 'MSYS')
with:
msystem: MSYS
update: false
install: >-
git
mingw-w64-x86_64-gcc
mingw-w64-x86_64-gcc-fortran
python
python-pip
cmake
ninja

- name: Install fypp
run: pip install fypp

- run: >-
PATH=$PATH:/mingw64/bin/ cmake
-Wdev
Expand Down
Loading