diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 8ef5716..e0469c5 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -15,30 +15,40 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            cc: "gcc"
-            cxx: "g++"
+            cc: gcc
+            cxx: g++
+            shell: bash
           - os: ubuntu-18.04
             env: ARCH=x86
-            cc: "gcc-4.8"
-            cxx: "g++-4.8"
+            cc: gcc-4.8
+            cxx: g++-4.8
+            shell: bash
           - os: ubuntu-22.04
             env: EMSCRIPTEN=ON
-            cc: "gcc"
-            cxx: "g++"
+            cc: gcc
+            cxx: g++
+            shell: bash
           - os: ubuntu-22.04
-            cc: "clang"
-            cxx: "clang++"
+            cc: clang
+            cxx: clang++
+            shell: bash
           - os: ubuntu-22.04
             env: CMAKE_EXTRA="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS='-march=native'"
-            cc: "gcc"
-            cxx: "g++"
+            cc: gcc
+            cxx: g++
+            shell: bash
           - os: macos-latest
-            cc: "clang"
-            cxx: "clang++"
+            cc: clang
+            cxx: clang++
+            shell: bash
           - os: windows-latest
-            cc: "gcc"
-            cxx: "g++"
+            cc: gcc
+            cxx: g++
+            shell: 'msys2 {0}'
     runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: ${{ matrix.shell }}
 
     steps:
     - uses: actions/checkout@v4
@@ -46,6 +56,10 @@ jobs:
         submodules: true
         fetch-depth: 0
 
+    - name: install mingw
+      uses: msys2/setup-msys2@v2
+      if: matrix.os == 'windows-latest'
+
     - name: Install Dependencies
       run: |
         if [ "${{ matrix.env }}" = "ARCH=x86" ]; then
@@ -64,7 +78,7 @@ jobs:
         mkdir build && cd build
         export CC=${{matrix.cc}}
         export CXX=${{matrix.cxx}}
-        cmake -Dmmtf_build_examples=ON -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=debug ..
+        ${{matrix.env}} cmake -Dmmtf_build_examples=ON -DBUILD_TESTS=ON -DCMAKE_BUILD_TYPE=debug ..
         make -j2
         echo "lol"
         ls