test: use pacboy

umarcor · Nov 4, 2021 · 2e4f548 · 2e4f548
1 parent e82282e
commit 2e4f548
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 82 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -47,6 +47,7 @@ jobs:
       with:
         msystem: ${{ matrix.sys.msystem }}
         update: true
+        install: pactoys
 
     - name: '🏳️ Test'
       run: ./test/${{ matrix.tool }}.sh
diff --git a/test/dfu-util.sh b/test/dfu-util.sh
@@ -6,17 +6,8 @@ cd $(dirname "$0")
 
 ./env.sh
 
-printf '\n::group::Install dfu-util through pacman\n'
-  case "$MSYSTEM" in
-    MINGW64|mingw64) _arch='x86_64' ;;
-    MINGW32|mingw32) _arch='i686'   ;;
-    *)
-      echo 'Unknown MSYSTEM: $MSYSTEM'
-      exit 1
-    ;;
-  esac
-
-  pacman -S --noconfirm mingw-w64-${_arch}-dfu-util
+printf '\n::group::Install dfu-util through pacboy\n'
+pacboy -S --noconfirm dfu-util:p
 echo '::endgroup::'
 
 printf '\nSmoke tests\n'

diff --git a/test/ghdl.sh b/test/ghdl.sh
@@ -6,25 +6,18 @@ cd $(dirname "$0")
 
 ./env.sh
 
-printf '\n::group::Install ghdl through pacman\n'
-  case "$MSYSTEM" in
-    MINGW64|mingw64) _arch='x86_64' ;;
-    MINGW32|mingw32) _arch='i686'   ;;
-    *)
-      echo 'Unknown MSYSTEM: $MSYSTEM'
-      exit 1
-    ;;
-  esac
-
-  pacman -S --noconfirm \
-    diffutils \
-    git \
-    make \
-    mingw-w64-${_arch}-gcc \
-    mingw-w64-${_arch}-ghdl \
-    mingw-w64-${_arch}-python-pip \
-    mingw-w64-${_arch}-python-pytest \
-    mingw-w64-${_arch}-python-wheel
+printf '\n::group::Install ghdl and dependencies through pacman and pacboy\n'
+pacman -S --noconfirm \
+  diffutils \
+  git \
+  make
+
+pacboy -S --noconfirm \
+  gcc:p \
+  ghdl:p \
+  python-pip:p \
+  python-pytest:p \
+  python-wheel:p
 echo '::endgroup::'
 
 printf '\nSmoke tests\n'

diff --git a/test/icesprog.sh b/test/icesprog.sh
@@ -6,17 +6,8 @@ cd $(dirname "$0")
 
 ./env.sh
 
-printf '\n::group::Install icesprog through pacman\n'
-  case "$MSYSTEM" in
-    MINGW64|mingw64) _arch='x86_64' ;;
-    MINGW32|mingw32) _arch='i686'   ;;
-    *)
-      echo 'Unknown MSYSTEM: $MSYSTEM'
-      exit 1
-    ;;
-  esac
-
-  pacman -S --noconfirm mingw-w64-${_arch}-icesprog
+printf '\n::group::Install icesprog through pacboy\n'
+pacboy -S --noconfirm icesprog:p
 echo '::endgroup::'
 
 printf '\nSmoke tests\n'

diff --git a/test/icestorm.sh b/test/icestorm.sh
@@ -6,17 +6,8 @@ cd $(dirname "$0")
 
 ./env.sh
 
-printf '\n::group::Install icestorm through pacman\n'
-  case "$MSYSTEM" in
-    MINGW64|mingw64) _arch='x86_64' ;;
-    MINGW32|mingw32) _arch='i686'   ;;
-    *)
-      echo 'Unknown MSYSTEM: $MSYSTEM'
-      exit 1
-    ;;
-  esac
-
-  pacman -S --noconfirm mingw-w64-${_arch}-icestorm
+printf '\n::group::Install icestorm through pacboy\n'
+pacboy -S --noconfirm icestorm:p
 echo '::endgroup::'
 
 printf '\nSmoke tests (icestorm)\n'

diff --git a/test/iverilog.sh b/test/iverilog.sh
@@ -6,25 +6,18 @@ cd $(dirname "$0")
 
 ./env.sh
 
-printf '\n::group::Install iverilog through pacman\n'
-  case "$MSYSTEM" in
-    MINGW64|mingw64) _arch='x86_64' ;;
-    MINGW32|mingw32) _arch='i686'   ;;
-    *)
-      echo 'Unknown MSYSTEM: $MSYSTEM'
-      exit 1
-    ;;
-  esac
-
-  pacman -S --noconfirm \
-    diffutils \
-    git \
-    make \
-    mingw-w64-${_arch}-gcc \
-    mingw-w64-${_arch}-python-pip \
-    mingw-w64-${_arch}-python-pytest \
-    mingw-w64-${_arch}-python-wheel \
-    mingw-w64-${_arch}-iverilog
+printf '\n::group::Install iverilog and dependencies through pacman and pacboy\n'
+pacman -S --noconfirm \
+  diffutils \
+  git \
+  make
+
+pacboy -S --noconfirm \
+  gcc:p \
+  python-pip:p \
+  python-pytest:p \
+  python-wheel:p \
+  iverilog:p
 echo '::endgroup::'
 
 printf '\nSmoke tests\n'

diff --git a/test/yosys.sh b/test/yosys.sh
@@ -6,17 +6,9 @@ cd $(dirname "$0")
 
 ./env.sh
 
-printf '\n::group::Install ghdl through pacman\n'
-  case "$MSYSTEM" in
-    MINGW64|mingw64) _arch='x86_64' ;;
-    MINGW32|mingw32) _arch='i686'   ;;
-    *)
-      echo 'Unknown MSYSTEM: $MSYSTEM'
-      exit 1
-    ;;
-  esac
-
-  pacman -S --noconfirm make mingw-w64-${_arch}-yosys
+printf '\n::group::Install yosys and dependencies through pacman and pacboy\n'
+pacman -S --noconfirm make
+pacboy -S --noconfirm yosys:p
 echo '::endgroup::'
 
 printf '\nSmoke tests\n'