From a5e9e38937bb82707c22ca5d35b70b2b21d3e9b6 Mon Sep 17 00:00:00 2001
From: minhqdao <hello@minhdao.de>
Date: Sun, 4 Aug 2024 15:18:22 +0530
Subject: [PATCH] Split setup again and but still install fypp as msys2 package
 on mingw

---
 .github/workflows/ci_windows.yml | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml
index 811a625e8..b45d26b2f 100644
--- a/.github/workflows/ci_windows.yml
+++ b/.github/workflows/ci_windows.yml
@@ -23,8 +23,9 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Setup environment
+    - name: Setup MinGW native environment
       uses: msys2/setup-msys2@v2
+      if: contains(matrix.msystem, 'MINGW')
       with:
         msystem: ${{ matrix.msystem }}
         update: false
@@ -36,6 +37,25 @@ jobs:
           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
+      if: contains(matrix.msystem, 'MSYS')
+      run: pip install fypp
 
     - run: >-
         PATH=$PATH:/mingw64/bin/ cmake