Skip to content

Commit fa09950

Browse files
committed
GHA: use pacboy to install msys2 packages
1 parent eba0679 commit fa09950

File tree

1 file changed

+18
-26
lines changed

1 file changed

+18
-26
lines changed

.github/workflows/test-msys2.yml

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,8 @@ jobs:
2626
matrix:
2727
include:
2828
- msystem: "UCRT64"
29-
package: "mingw-w64-ucrt-x86_64"
3029
- msystem: "CLANG64"
31-
package: "mingw-w64-clang-i686"
3230
- msystem: "MINGW64"
33-
package: "mingw-w64-x86_64"
34-
3531
defaults:
3632
run:
3733
shell: bash.exe --login -eo pipefail "{0}"
@@ -52,28 +48,24 @@ jobs:
5248

5349
- name: Install dependencies
5450
run: |
55-
pacman -S --noconfirm \
56-
${{ matrix.package }}-freetype \
57-
${{ matrix.package }}-gcc \
58-
${{ matrix.package }}-ghostscript \
59-
${{ matrix.package }}-lcms2 \
60-
${{ matrix.package }}-libimagequant \
61-
${{ matrix.package }}-libjpeg-turbo \
62-
${{ matrix.package }}-libraqm \
63-
${{ matrix.package }}-libtiff \
64-
${{ matrix.package }}-libwebp \
65-
${{ matrix.package }}-openjpeg2 \
66-
${{ matrix.package }}-python3-cffi \
67-
${{ matrix.package }}-python3-numpy \
68-
${{ matrix.package }}-python3-olefile \
69-
${{ matrix.package }}-python3-pip \
70-
${{ matrix.package }}-python3-setuptools \
71-
subversion
72-
73-
if [[ ${{ matrix.msystem }} =~ "64" ]]; then
74-
pacman -S --noconfirm \
75-
${{ matrix.package }}-python-pyqt6
76-
fi
51+
pacboy -S --noconfirm \
52+
freetype:p \
53+
gcc:p \
54+
ghostscript:p \
55+
lcms2:p \
56+
libimagequant:p \
57+
libjpeg-turbo:p \
58+
libraqm:p \
59+
libtiff:p \
60+
libwebp:p \
61+
openjpeg2:p \
62+
python3-cffi:p \
63+
python3-numpy:p \
64+
python3-olefile:p \
65+
python3-pip:p \
66+
python3-setuptools:p \
67+
python-pyqt6:p \
68+
subversion:
7769
7870
python3 -m pip install pyroma pytest pytest-cov pytest-timeout
7971

0 commit comments

Comments
 (0)