From 81edd8f6c9bf276f26b847e42d20b2dbd8a7a87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20L=C3=B3pez?= <emilio.lopez@trailofbits.com>
Date: Fri, 20 Oct 2023 23:38:02 -0300
Subject: [PATCH] Unify msys2 installations

---
 .github/workflows/ci.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4d99b6516..5a94f2634 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,8 @@ jobs:
         uses: msys2/setup-msys2@v2
         if: runner.os == 'Windows'
         with:
-          msystem: UCRT64
+          msystem: MINGW64
+          release: false
           path-type: inherit
           update: true
           install: >-
@@ -71,7 +72,7 @@ jobs:
         with:
           path: |
             ~/.local
-            D:\a\_temp\msys64\home\runneradmin\.local
+            C:\msys64\home\runneradmin\.local
           key: ${{ runner.os }}-local-${{ env.CACHE_VERSION }}-${{ hashFiles('.github/scripts/install-*') }}
 
       - name: Cache Stack & Cabal
@@ -92,11 +93,6 @@ jobs:
         env:
           HOST_OS: ${{ runner.os }}
 
-      - name: Install GMP in Stack MSYS2 (Windows)
-        if: runner.os == 'Windows'
-        run: |
-          stack exec -- pacman --noconfirm -S mingw-w64-x86_64-gmp
-
       - name: Build Dependencies
         run: |
           stack build --ghc-options="-Werror" --extra-include-dirs=$HOME/.local/include --extra-lib-dirs=$HOME/.local/lib --only-dependencies