Merge pull request #6922 from radarhere/dependencies

Sort dependencies
This commit is contained in:
Andrew Murray 2023-01-31 20:17:06 +11:00 committed by GitHub
commit f82546fa2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 11 deletions

View File

@ -34,18 +34,34 @@ jobs:
with: with:
platform: x86_64 platform: x86_64
packages: > packages: >
ImageMagick gcc-g++ ghostscript jpeg libfreetype-devel gcc-g++
libimagequant-devel libjpeg-devel liblapack-devel ghostscript
liblcms2-devel libopenjp2-devel libraqm-devel ImageMagick
libtiff-devel libwebp-devel libxcb-devel libxcb-xinerama0 jpeg
make netpbm perl libfreetype-devel
libimagequant-devel
libjpeg-devel
liblapack-devel
liblcms2-devel
libopenjp2-devel
libraqm-devel
libtiff-devel
libwebp-devel
libxcb-devel
libxcb-xinerama0
make
netpbm
perl
python3${{ matrix.python-minor-version }}-cffi python3${{ matrix.python-minor-version }}-cffi
python3${{ matrix.python-minor-version }}-cython python3${{ matrix.python-minor-version }}-cython
python3${{ matrix.python-minor-version }}-devel python3${{ matrix.python-minor-version }}-devel
python3${{ matrix.python-minor-version }}-numpy python3${{ matrix.python-minor-version }}-numpy
python3${{ matrix.python-minor-version }}-sip python3${{ matrix.python-minor-version }}-sip
python3${{ matrix.python-minor-version }}-tkinter python3${{ matrix.python-minor-version }}-tkinter
qt5-devel-tools subversion xorg-server-extra zlib-devel qt5-devel-tools
subversion
xorg-server-extra
zlib-devel
- name: Add Lapack to PATH - name: Add Lapack to PATH
uses: egor-tensin/cleanup-path@v3 uses: egor-tensin/cleanup-path@v3

View File

@ -45,11 +45,6 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
pacman -S --noconfirm \ pacman -S --noconfirm \
${{ matrix.package }}-python3-cffi \
${{ matrix.package }}-python3-numpy \
${{ matrix.package }}-python3-olefile \
${{ matrix.package }}-python3-pip \
${{ matrix.package }}-python3-setuptools \
${{ matrix.package }}-freetype \ ${{ matrix.package }}-freetype \
${{ matrix.package }}-gcc \ ${{ matrix.package }}-gcc \
${{ matrix.package }}-ghostscript \ ${{ matrix.package }}-ghostscript \
@ -60,6 +55,11 @@ jobs:
${{ matrix.package }}-libtiff \ ${{ matrix.package }}-libtiff \
${{ matrix.package }}-libwebp \ ${{ matrix.package }}-libwebp \
${{ matrix.package }}-openjpeg2 \ ${{ matrix.package }}-openjpeg2 \
${{ matrix.package }}-python3-cffi \
${{ matrix.package }}-python3-numpy \
${{ matrix.package }}-python3-olefile \
${{ matrix.package }}-python3-pip \
${{ matrix.package }}-python3-setuptools \
subversion subversion
if [ ${{ matrix.package }} == "mingw-w64-x86_64" ]; then if [ ${{ matrix.package }} == "mingw-w64-x86_64" ]; then