From 5c76ce39235ef58ce2355dd189f93a0a8fd85955 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Mon, 30 Nov 2020 22:19:38 +0100
Subject: [PATCH 01/15] ci/win: add 'build.sh'

---
 .github/build.sh           | 15 +++++++++++++++
 .github/workflows/test.yml |  5 +----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100755 .github/build.sh

diff --git a/.github/build.sh b/.github/build.sh
new file mode 100755
index 000000000..00e8b5336
--- /dev/null
+++ b/.github/build.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+wrap_task() {
+  echo "::group::$@"
+  "$@"
+  echo '::endgroup::'
+}
+
+wrap_task ./autoconf.sh
+wrap_task ./configure
+wrap_task make install
+
+which iverilog
+
+wrap_task make check
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b62d8df78..3104733d4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -61,9 +61,6 @@ jobs:
       run: |
         export mingw64='cmd //C RefreshEnv.cmd & set MSYS=winsymlinks:nativestrict & C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "$@" --'
 
-        $mingw64 ./autoconf.sh
-        $mingw64 ./configure
-        $mingw64 make install
-        $mingw64 make check
+        $mingw64 ./.github/build.sh
 
         $mingw64 ./.github/test.sh

From bbd09ce87ca1d3991a2ece0a00bd254a6624dead Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Mon, 30 Nov 2020 09:12:54 +0100
Subject: [PATCH 02/15] ci/win: add mingw64

---
 .github/mingw64            |  3 +++
 .github/workflows/test.yml | 14 ++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100755 .github/mingw64

diff --git a/.github/mingw64 b/.github/mingw64
new file mode 100755
index 000000000..d296f48d6
--- /dev/null
+++ b/.github/mingw64
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+
+MSYS=winsymlinks:nativestrict C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "$@" --
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 3104733d4..f4606dc02 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,6 +41,8 @@ jobs:
   win:
     runs-on: windows-latest
     name: '🧊 Windows'
+    defaults:
+      shell: bash
     steps:
 
     - run: git config --global core.autocrlf input
@@ -56,11 +58,11 @@ jobs:
           mingw-w64-x86_64-toolchain
         update: true
 
-    - name: Build and test
-      shell: bash
-      run: |
-        export mingw64='cmd //C RefreshEnv.cmd & set MSYS=winsymlinks:nativestrict & C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "$@" --'
+    - name: Add .github to PATH
+      run: echo "$(cygpath -w $(pwd)/.github)" >> $GITHUB_PATH
 
-        $mingw64 ./.github/build.sh
+    - name: Build
+      run: mingw64 ./.github/build.sh
 
-        $mingw64 ./.github/test.sh
+    - name: Test
+      run: mingw64 ./.github/test.sh

From 7a729f3ff8555658db03acfc896d59e7c00779f3 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Tue, 1 Dec 2020 02:19:27 +0100
Subject: [PATCH 03/15] ci/win: use mingw64 as a custom shell

---
 .github/bin/mingw64.cmd    |  4 ++++
 .github/mingw64            |  3 ---
 .github/workflows/test.yml | 17 +++++++++--------
 3 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100755 .github/bin/mingw64.cmd
 delete mode 100755 .github/mingw64

diff --git a/.github/bin/mingw64.cmd b/.github/bin/mingw64.cmd
new file mode 100755
index 000000000..715161ceb
--- /dev/null
+++ b/.github/bin/mingw64.cmd
@@ -0,0 +1,4 @@
+@echo off
+setlocal
+set MSYS=winsymlinks:nativestrict
+C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here %*
diff --git a/.github/mingw64 b/.github/mingw64
deleted file mode 100755
index d296f48d6..000000000
--- a/.github/mingw64
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-MSYS=winsymlinks:nativestrict C:\\msys64\\msys2_shell.cmd -defterm -no-start -mingw64 -full-path -here -c "$@" --
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f4606dc02..bfe3fe93a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -8,7 +8,6 @@ jobs:
 
 
   lin:
-
     strategy:
       fail-fast: false
       matrix:
@@ -42,10 +41,15 @@ jobs:
     runs-on: windows-latest
     name: '🧊 Windows'
     defaults:
-      shell: bash
+      run:
+        shell: mingw64 {0}
     steps:
 
-    - run: git config --global core.autocrlf input
+    - name: Setup
+      shell: bash
+      run: |
+        git config --global core.autocrlf input
+        echo "$(cygpath -w $(pwd)/.github/bin)" >> $GITHUB_PATH
 
     - uses: actions/checkout@v2
 
@@ -58,11 +62,8 @@ jobs:
           mingw-w64-x86_64-toolchain
         update: true
 
-    - name: Add .github to PATH
-      run: echo "$(cygpath -w $(pwd)/.github)" >> $GITHUB_PATH
-
     - name: Build
-      run: mingw64 ./.github/build.sh
+      run: ./.github/build.sh
 
     - name: Test
-      run: mingw64 ./.github/test.sh
+      run: ./.github/test.sh

From 08ec099091862b78020594152200aed6aa3a3315 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Tue, 1 Dec 2020 04:24:51 +0100
Subject: [PATCH 04/15] ci/win: merge 'build.sh' into workflow

---
 .github/build.sh           | 15 ---------------
 .github/workflows/test.yml | 10 ++++++++--
 2 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100755 .github/build.sh

diff --git a/.github/build.sh b/.github/build.sh
deleted file mode 100755
index 00e8b5336..000000000
--- a/.github/build.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-wrap_task() {
-  echo "::group::$@"
-  "$@"
-  echo '::endgroup::'
-}
-
-wrap_task ./autoconf.sh
-wrap_task ./configure
-wrap_task make install
-
-which iverilog
-
-wrap_task make check
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bfe3fe93a..8ee1902fe 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -62,8 +62,14 @@ jobs:
           mingw-w64-x86_64-toolchain
         update: true
 
-    - name: Build
-      run: ./.github/build.sh
+    - name: Build, install and check
+      run: |
+        wrap() { echo "::group::$@"; "$@"; echo '::endgroup::'; }
+        wrap ./autoconf.sh
+        wrap ./configure
+        wrap make install
+        which iverilog
+        wrap make check
 
     - name: Test
       run: ./.github/test.sh

From 7419875e2f3a80d132957e13845adead1060a3c3 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Sun, 29 Nov 2020 06:12:41 +0100
Subject: [PATCH 05/15] msys2: add PKGBUILD

---
 msys2/PKGBUILD | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 msys2/PKGBUILD

diff --git a/msys2/PKGBUILD b/msys2/PKGBUILD
new file mode 100644
index 000000000..e9116f62c
--- /dev/null
+++ b/msys2/PKGBUILD
@@ -0,0 +1,37 @@
+_realname=iverilog
+pkgbase=mingw-w64-${_realname}
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
+pkgver=ci
+pkgrel=1
+pkgdesc="Icarus Verilog, a Verilog simulation and synthesis tool (mingw-w64)"
+arch=('any')
+url="http://iverilog.icarus.com/"
+license=('GPLv2+')
+depends=("${MINGW_PACKAGE_PREFIX}-readline"
+         "${MINGW_PACKAGE_PREFIX}-gcc-libs")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+             "${MINGW_PACKAGE_PREFIX}-ghostscript")
+
+source=()
+sha256sums=()
+
+build() {
+  cd "${srcdir}"/../..
+  sh autoconf.sh
+  ./configure \
+    --prefix="${MINGW_PREFIX}" \
+    --host="$CARCH"-w64-mingw32
+  make
+}
+
+check() {
+  cd "${srcdir}"/../..
+  make check
+}
+
+package() {
+  cd "${srcdir}"/../..
+  make DESTDIR="${pkgdir}" install
+  mkdir -p "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"
+  mv "${pkgdir}${MINGW_PREFIX}"/*.pdf "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"
+}

From 2f86923c71264147aecc86711f6d7ccc7eee8087 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Tue, 1 Dec 2020 16:27:21 +0100
Subject: [PATCH 06/15] msys2: use mingw32-make

---
 msys2/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/msys2/PKGBUILD b/msys2/PKGBUILD
index e9116f62c..36482c927 100644
--- a/msys2/PKGBUILD
+++ b/msys2/PKGBUILD
@@ -21,17 +21,17 @@ build() {
   ./configure \
     --prefix="${MINGW_PREFIX}" \
     --host="$CARCH"-w64-mingw32
-  make
+  mingw32-make
 }
 
 check() {
   cd "${srcdir}"/../..
-  make check
+  mingw32-make check
 }
 
 package() {
   cd "${srcdir}"/../..
-  make DESTDIR="${pkgdir}" install
+  mingw32-make DESTDIR="${pkgdir}" install
   mkdir -p "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"
   mv "${pkgdir}${MINGW_PREFIX}"/*.pdf "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}"
 }

From 59e117ddcc2a9d050c304626895860a8d46bf30b Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Sun, 29 Nov 2020 06:11:44 +0100
Subject: [PATCH 07/15] ci/win: add 'msys2' jobs

---
 .github/workflows/test.yml | 52 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8ee1902fe..f19e848bc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -73,3 +73,55 @@ jobs:
 
     - name: Test
       run: ./.github/test.sh
+
+
+  msys2:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include: [
+          { msystem: MINGW64, arch: x86_64 },
+          { msystem: MINGW32, arch: i686   }
+        ]
+    name: '🟪 MSYS2 · ${{ matrix.msystem }}'
+    defaults:
+      run:
+        shell: msys2 {0}
+    env:
+      MINGW_INSTALLS: ${{ matrix.msystem }}
+    steps:
+
+    - run: git config --global core.autocrlf input
+      shell: bash
+
+    - uses: actions/checkout@v2
+
+    - uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{ matrix.msystem }}
+        install: >
+          tcsh
+          git
+          base-devel
+          mingw-w64-${{ matrix.arch }}-toolchain
+        update: true
+
+    - name: Build
+      run: |
+        cd msys2
+        makepkg-mingw --noconfirm --noprogressbar -sCLf
+
+    - name: Install
+      run: pacman -U --noconfirm msys2/*.zst
+
+    - name: Test
+      run: |
+        git clone https://github.com/albertxie/iverilog-tutorial
+        cd iverilog-tutorial/code_samples
+        iverilog -o simple.vvp simple.v simple_tb.v
+        vvp simple.vvp
+
+        git clone git://github.com/steveicarus/ivtest.git
+        cd ivtest
+        ./regress

From eca41e411ea06669ece6c893eaed904b36460cf2 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Mon, 30 Nov 2020 02:34:17 +0100
Subject: [PATCH 08/15] ci/win: use 'test.sh'

---
 .github/workflows/test.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f19e848bc..23a95f9e0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -101,7 +101,6 @@ jobs:
       with:
         msystem: ${{ matrix.msystem }}
         install: >
-          tcsh
           git
           base-devel
           mingw-w64-${{ matrix.arch }}-toolchain
@@ -116,12 +115,4 @@ jobs:
       run: pacman -U --noconfirm msys2/*.zst
 
     - name: Test
-      run: |
-        git clone https://github.com/albertxie/iverilog-tutorial
-        cd iverilog-tutorial/code_samples
-        iverilog -o simple.vvp simple.v simple_tb.v
-        vvp simple.vvp
-
-        git clone git://github.com/steveicarus/ivtest.git
-        cd ivtest
-        ./regress
+      run: ./.github/test.sh

From ed27dbf6084d2e35fa23ead1724bce4e8ca9ccd2 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Tue, 1 Dec 2020 04:20:52 +0100
Subject: [PATCH 09/15] ci/win: merge 'win' and 'msys'

---
 .github/workflows/test.yml | 83 ++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 23a95f9e0..bd6ac4622 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,10 +39,38 @@ jobs:
 
   win:
     runs-on: windows-latest
-    name: '🧊 Windows'
+    strategy:
+      fail-fast: false
+      matrix:
+        include: [
+          {
+            label: '🧊 Windows',
+            msystem: MINGW64,
+            arch: x86_64,
+            release: false,
+            shell: mingw64,
+          },
+          {
+            label: '🟪 MSYS2',
+            msystem: MINGW64,
+            arch: x86_64,
+            release: true,
+            shell: msys2,
+          },
+          {
+            label: '🟪 MSYS2',
+            msystem: MINGW32,
+            arch: i686,
+            release: true,
+            shell: msys2,
+          }
+        ]
+    name: ${{ matrix.label }} · ${{ matrix.msystem}}
     defaults:
       run:
-        shell: mingw64 {0}
+        shell: ${{ matrix.shell }} {0}
+    env:
+      MINGW_INSTALLS: ${{ matrix.msystem }}
     steps:
 
     - name: Setup
@@ -55,14 +83,16 @@ jobs:
 
     - uses: msys2/setup-msys2@v2
       with:
-        release: false
-        msystem: MINGW64
+        release: ${{ matrix.release }}
+        msystem: ${{ matrix.msystem }}
         install: >
+          git
           base-devel
-          mingw-w64-x86_64-toolchain
+          mingw-w64-${{ matrix.arch }}-toolchain
         update: true
 
-    - name: Build, install and check
+    - name: 🧊 Build, install and check
+      if: matrix.shell == 'mingw64'
       run: |
         wrap() { echo "::group::$@"; "$@"; echo '::endgroup::'; }
         wrap ./autoconf.sh
@@ -71,47 +101,14 @@ jobs:
         which iverilog
         wrap make check
 
-    - name: Test
-      run: ./.github/test.sh
-
-
-  msys2:
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include: [
-          { msystem: MINGW64, arch: x86_64 },
-          { msystem: MINGW32, arch: i686   }
-        ]
-    name: '🟪 MSYS2 · ${{ matrix.msystem }}'
-    defaults:
-      run:
-        shell: msys2 {0}
-    env:
-      MINGW_INSTALLS: ${{ matrix.msystem }}
-    steps:
-
-    - run: git config --global core.autocrlf input
-      shell: bash
-
-    - uses: actions/checkout@v2
-
-    - uses: msys2/setup-msys2@v2
-      with:
-        msystem: ${{ matrix.msystem }}
-        install: >
-          git
-          base-devel
-          mingw-w64-${{ matrix.arch }}-toolchain
-        update: true
-
-    - name: Build
+    - name: 🟪 Build and check
+      if: matrix.shell == 'msys2'
       run: |
         cd msys2
         makepkg-mingw --noconfirm --noprogressbar -sCLf
 
-    - name: Install
+    - name: 🟪 Install
+      if: matrix.shell == 'msys2'
       run: pacman -U --noconfirm msys2/*.zst
 
     - name: Test

From 0fdffe624dfa103184b74245d05e7a7836f7d178 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Tue, 1 Dec 2020 05:12:06 +0100
Subject: [PATCH 10/15] ci/win: test mingw64|msys2 and manual|pkgbuild

---
 .github/workflows/test.yml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index bd6ac4622..6954a35e1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -42,35 +42,41 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include: [
+        shell: [
+          mingw64,
+          msys2
+        ]
+        build: [
+          manual,
+          pkgbuild
+        ]
+        task: [
           {
-            label: '🧊 Windows',
+            label: '🧊',
             msystem: MINGW64,
             arch: x86_64,
             release: false,
-            shell: mingw64,
           },
           {
-            label: '🟪 MSYS2',
+            label: '🟪',
             msystem: MINGW64,
             arch: x86_64,
             release: true,
-            shell: msys2,
           },
           {
-            label: '🟪 MSYS2',
+            label: '🟪',
             msystem: MINGW32,
             arch: i686,
             release: true,
-            shell: msys2,
           }
         ]
-    name: ${{ matrix.label }} · ${{ matrix.msystem}}
+    name: ${{ matrix.task.label }} ${{ matrix.task.msystem}} · ${{ matrix.shell }} · ${{ matrix.build }}
     defaults:
       run:
         shell: ${{ matrix.shell }} {0}
     env:
-      MINGW_INSTALLS: ${{ matrix.msystem }}
+      MINGW_INSTALLS: ${{ matrix.task.msystem }}
+      MSYSTEM: ${{ matrix.task.msystem }}
     steps:
 
     - name: Setup
@@ -83,16 +89,16 @@ jobs:
 
     - uses: msys2/setup-msys2@v2
       with:
-        release: ${{ matrix.release }}
-        msystem: ${{ matrix.msystem }}
+        release: ${{ matrix.task.release }}
+        msystem: ${{ matrix.task.msystem }}
         install: >
           git
           base-devel
-          mingw-w64-${{ matrix.arch }}-toolchain
+          mingw-w64-${{ matrix.task.arch }}-toolchain
         update: true
 
     - name: 🧊 Build, install and check
-      if: matrix.shell == 'mingw64'
+      if: matrix.build == 'manual'
       run: |
         wrap() { echo "::group::$@"; "$@"; echo '::endgroup::'; }
         wrap ./autoconf.sh
@@ -102,13 +108,13 @@ jobs:
         wrap make check
 
     - name: 🟪 Build and check
-      if: matrix.shell == 'msys2'
+      if: matrix.build == 'pkgbuild'
       run: |
         cd msys2
         makepkg-mingw --noconfirm --noprogressbar -sCLf
 
     - name: 🟪 Install
-      if: matrix.shell == 'msys2'
+      if: matrix.build == 'pkgbuild'
       run: pacman -U --noconfirm msys2/*.zst
 
     - name: Test

From e30cbee3321a212b7cf9f5f6b35f82a3cb25bd66 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Tue, 1 Dec 2020 16:50:57 +0100
Subject: [PATCH 11/15] ci/win: mingw64 mingw32-make

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6954a35e1..816b38859 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -103,9 +103,9 @@ jobs:
         wrap() { echo "::group::$@"; "$@"; echo '::endgroup::'; }
         wrap ./autoconf.sh
         wrap ./configure
-        wrap make install
+        wrap mingw32-make install
         which iverilog
-        wrap make check
+        wrap mingw32-make check
 
     - name: 🟪 Build and check
       if: matrix.build == 'pkgbuild'

From efdf4a8a8ae69de24788a684ca723b5e8b993f37 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Tue, 1 Dec 2020 18:12:23 +0100
Subject: [PATCH 12/15] msys2: set LDFLAGS=-pipe to disable ASLR

---
 msys2/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/msys2/PKGBUILD b/msys2/PKGBUILD
index 36482c927..36f52b212 100644
--- a/msys2/PKGBUILD
+++ b/msys2/PKGBUILD
@@ -21,7 +21,7 @@ build() {
   ./configure \
     --prefix="${MINGW_PREFIX}" \
     --host="$CARCH"-w64-mingw32
-  mingw32-make
+  mingw32-make LDFLAGS="-pipe"
 }
 
 check() {

From 5e1dbb162414fe2386c213fa589b8b88ea980cb8 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Wed, 2 Dec 2020 01:26:46 +0100
Subject: [PATCH 13/15] ci/win: test mingw64-manual and msys2-pkgbuild only

---
 .github/workflows/test.yml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 816b38859..c43a82dd2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -46,10 +46,6 @@ jobs:
           mingw64,
           msys2
         ]
-        build: [
-          manual,
-          pkgbuild
-        ]
         task: [
           {
             label: '🧊',
@@ -70,7 +66,7 @@ jobs:
             release: true,
           }
         ]
-    name: ${{ matrix.task.label }} ${{ matrix.task.msystem}} · ${{ matrix.shell }} · ${{ matrix.build }}
+    name: ${{ matrix.task.label }} ${{ matrix.task.msystem}} · ${{ matrix.shell }}
     defaults:
       run:
         shell: ${{ matrix.shell }} {0}
@@ -98,7 +94,7 @@ jobs:
         update: true
 
     - name: 🧊 Build, install and check
-      if: matrix.build == 'manual'
+      if: matrix.shell == 'mingw64'
       run: |
         wrap() { echo "::group::$@"; "$@"; echo '::endgroup::'; }
         wrap ./autoconf.sh
@@ -108,13 +104,13 @@ jobs:
         wrap mingw32-make check
 
     - name: 🟪 Build and check
-      if: matrix.build == 'pkgbuild'
+      if: matrix.shell == 'msys2'
       run: |
         cd msys2
         makepkg-mingw --noconfirm --noprogressbar -sCLf
 
     - name: 🟪 Install
-      if: matrix.build == 'pkgbuild'
+      if: matrix.shell == 'msys2'
       run: pacman -U --noconfirm msys2/*.zst
 
     - name: Test

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 14/15] 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

From cd7c3fdc4c4b9b800baf4e2fbcea2e345b8752ba Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Thu, 3 Dec 2020 08:50:16 +0100
Subject: [PATCH 15/15] ci/win: upload artifacts

---
 .github/workflows/test.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1f837b7de..32d2ae3d0 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -78,3 +78,8 @@ jobs:
 
     - name: Test
       run: ./.github/test.sh
+
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ${{ matrix.msystem }}-${{ matrix.arch }}
+        path: msys2/*.zst