From 97e8fa662186b42048c4746775bfe3bbfed06570 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 20 Jul 2021 15:32:15 +0000
Subject: Use msys2/setup-msys2@v2 rule to install msys2, working around
 limitations in msys2

---
 .github/workflows/win-build.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 637ca7e..40f5b92 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -1,5 +1,7 @@
 name: Windows
 on: [push]
+env:
+  ERROR_ON_FAILURES: 1
 jobs:
   msvc:
     runs-on: windows-2016
@@ -38,13 +40,11 @@ jobs:
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
-        env:
-          ERROR_ON_FAILURES: 1
   gcc:
     runs-on: windows-2016
     defaults:
       run:
-        shell: bash
+        shell: msys2 {0}
         working-directory: win
     strategy:
       matrix:
@@ -55,10 +55,13 @@ jobs:
           - "--enable-symbols=mem"
     # Using powershell means we need to explicitly stop on failure
     steps:
+      - name: Install MSYS2
+        uses: msys2/setup-msys2@v2
+        with:
+          msystem: MINGW64
+          install: git mingw-w64-x86_64-toolchain make
       - name: Checkout
         uses: actions/checkout@v2
-      - name: Install MSYS2 and Make
-        run: choco install msys2 make
       - name: Prepare
         run: |
           touch tclStubInit.c
@@ -75,5 +78,3 @@ jobs:
         run: make tcltest
       - name: Run Tests
         run: make test
-        env:
-          ERROR_ON_FAILURES: 1
-- 
cgit v0.12