From e62d47d725beb83ea8d729bfee4677738860cb22 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 31 Jul 2021 15:59:11 +0000
Subject: Backout last 2 commits: It appears that on Windows-2016 the
 GITHUB-installed version of msys works better than the official msys2

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

diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml
index 133eabb..637ca7e 100644
--- a/.github/workflows/win-build.yml
+++ b/.github/workflows/win-build.yml
@@ -1,7 +1,5 @@
 name: Windows
 on: [push]
-env:
-  ERROR_ON_FAILURES: 1
 jobs:
   msvc:
     runs-on: windows-2016
@@ -40,11 +38,13 @@ jobs:
           if ($lastexitcode -ne 0) {
              throw "nmake exit code: $lastexitcode"
           }
+        env:
+          ERROR_ON_FAILURES: 1
   gcc:
     runs-on: windows-2016
     defaults:
       run:
-        shell: msys2 {0}
+        shell: bash
         working-directory: win
     strategy:
       matrix:
@@ -55,14 +55,10 @@ 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
-          update: true
-          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
@@ -79,3 +75,5 @@ jobs:
         run: make tcltest
       - name: Run Tests
         run: make test
+        env:
+          ERROR_ON_FAILURES: 1
-- 
cgit v0.12