From 17ef6d65e1724181abc0541b0471d7e2ec927d67 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Thu, 3 Dec 2020 08:42:40 +0100
Subject: [PATCH] ci/win: cleanup

---
 .github/bin/mingw64.cmd    |  4 ---
 .github/workflows/test.yml | 63 ++++++++------------------------------
 2 files changed, 13 insertions(+), 54 deletions(-)
 delete mode 100755 .github/bin/mingw64.cmd

diff --git a/.github/bin/mingw64.cmd b/.github/bin/mingw64.cmd
deleted file mode 100755
index 715161ceb..000000000
--- a/.github/bin/mingw64.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-setlocal
-set MSYS=winsymlinks:nativestrict
-C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here %*
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index c43a82dd2..1f837b7de 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -26,7 +26,7 @@ jobs:
         sudo apt update -qq
         sudo apt install -y make g++ git bison flex gperf libreadline-dev autoconf
 
-    - name: Build
+    - name: Build, install and check
       run: |
         autoconf
         ./configure
@@ -42,75 +42,38 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        shell: [
-          mingw64,
-          msys2
+        include: [
+          { msystem: MINGW64, arch: x86_64 },
+          { msystem: MINGW32, arch: i686 }
         ]
-        task: [
-          {
-            label: '🧊',
-            msystem: MINGW64,
-            arch: x86_64,
-            release: false,
-          },
-          {
-            label: '🟪',
-            msystem: MINGW64,
-            arch: x86_64,
-            release: true,
-          },
-          {
-            label: '🟪',
-            msystem: MINGW32,
-            arch: i686,
-            release: true,
-          }
-        ]
-    name: ${{ matrix.task.label }} ${{ matrix.task.msystem}} · ${{ matrix.shell }}
+    name: 🟪 ${{ matrix.msystem}} · ${{ matrix.arch }}
     defaults:
       run:
-        shell: ${{ matrix.shell }} {0}
+        shell: msys2 {0}
     env:
-      MINGW_INSTALLS: ${{ matrix.task.msystem }}
-      MSYSTEM: ${{ matrix.task.msystem }}
+      MINGW_INSTALLS: ${{ matrix.msystem }}
     steps:
 
-    - name: Setup
+    - run: git config --global core.autocrlf input
       shell: bash
-      run: |
-        git config --global core.autocrlf input
-        echo "$(cygpath -w $(pwd)/.github/bin)" >> $GITHUB_PATH
 
     - uses: actions/checkout@v2
 
     - uses: msys2/setup-msys2@v2
       with:
-        release: ${{ matrix.task.release }}
-        msystem: ${{ matrix.task.msystem }}
+        msystem: ${{ matrix.msystem }}
+        update: true
         install: >
           git
           base-devel
-          mingw-w64-${{ matrix.task.arch }}-toolchain
-        update: true
+          mingw-w64-${{ matrix.arch }}-toolchain
 
-    - name: 🧊 Build, install and check
-      if: matrix.shell == 'mingw64'
-      run: |
-        wrap() { echo "::group::$@"; "$@"; echo '::endgroup::'; }
-        wrap ./autoconf.sh
-        wrap ./configure
-        wrap mingw32-make install
-        which iverilog
-        wrap mingw32-make check
-
-    - name: 🟪 Build and check
-      if: matrix.shell == 'msys2'
+    - name: Build and check
       run: |
         cd msys2
         makepkg-mingw --noconfirm --noprogressbar -sCLf
 
-    - name: 🟪 Install
-      if: matrix.shell == 'msys2'
+    - name: Install
       run: pacman -U --noconfirm msys2/*.zst
 
     - name: Test