From dbdb99f19e31912f746adf799b1d1cd6d0c4ad19 Mon Sep 17 00:00:00 2001
From: sergystepanov <SergyStepanov@gmail.com>
Date: Sun, 4 Oct 2020 18:11:02 +0300
Subject: [PATCH] Fix Github CI Windows build (Msys2) (#236)

---
 .github/workflows/build.yml            | 9 +++++----
 .github/workflows/release.yml.disabled | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8df1efa6..258551c5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -49,11 +49,11 @@ jobs:
 
       - name: Get Windows dev libraries and tools
         if: matrix.os == 'windows-latest'
-        uses: numworks/setup-msys2@v1
+        uses: msys2/setup-msys2@v2
         with:
           msystem: MINGW64
           path-type: inherit
-#          update: true
+          update: true
 
       - name: Load Go modules maybe?
         uses: actions/cache@v1
@@ -65,8 +65,9 @@ jobs:
 
       - name: Build Windows app
         if: matrix.os == 'windows-latest'
+        shell: msys2 {0}
         run: >
-          msys2do pacman -S --noconfirm --needed make
+          pacman -S --noconfirm --needed make
           mingw-w64-x86_64-gcc
           mingw-w64-x86_64-pkg-config
           mingw-w64-x86_64-dlfcn
@@ -74,7 +75,7 @@ jobs:
           mingw-w64-x86_64-opusfile
           mingw-w64-x86_64-SDL2
 
-          msys2do make build
+          make build
 
       - name: Build Linux app
         if: matrix.os == 'ubuntu-latest'
diff --git a/.github/workflows/release.yml.disabled b/.github/workflows/release.yml.disabled
index 06ec1bc4..98198f80 100644
--- a/.github/workflows/release.yml.disabled
+++ b/.github/workflows/release.yml.disabled
@@ -64,11 +64,11 @@ jobs:
 
     - name: Get Windows dev libraries and tools
       if: matrix.os == 'windows-latest'
-      uses: numworks/setup-msys2@v1
+      uses: msys2/setup-msys2@v2
       with:
         msystem: MINGW64
         path-type: inherit
-#        update: true
+        update: true
 
     - name: Load Go modules maybe?
       uses: actions/cache@v1
@@ -80,8 +80,9 @@ jobs:
 
     - name: Build Windows app
       if: matrix.os == 'windows-latest'
+      shell: msys2 {0}
       run: >
-        msys2do pacman -S --noconfirm --needed make
+        pacman -S --noconfirm --needed make
         mingw-w64-x86_64-gcc
         mingw-w64-x86_64-pkg-config
         mingw-w64-x86_64-dlfcn
@@ -89,7 +90,7 @@ jobs:
         mingw-w64-x86_64-opusfile
         mingw-w64-x86_64-SDL2
 
-        msys2do make release RELEASE_DIR=${{ env.release-dir }} DLIB_SEARCH_PATTERN=/mingw.*dll CORE_EXT=*.dll
+        make release RELEASE_DIR=${{ env.release-dir }} DLIB_SEARCH_PATTERN=/mingw.*dll CORE_EXT=*.dll
 
     - name: Build Linux app
       if: matrix.os == 'ubuntu-latest'