ci: Fix CI image builder

8 files changed, 48 insertions, 18 deletions

diff --git a/ci/ciimage/arch/install.sh b/ci/ciimage/arch/install.sh
index 0a33f1d..72816ab 100755
--- a/ci/ciimage/arch/install.sh
+++ b/ci/ciimage/arch/install.sh
@@ -2,10 +2,12 @@
 
 set -e
 
+source /ci/common.sh
+
 # Inspired by https://github.com/greyltc/docker-archlinux-aur/blob/master/add-aur.sh
 
 pkgs=(
-  python python-setuptools python-wheel python-pip python-pytest-xdist python-gobject python-jsonschema
+  python python-pip
   ninja make git sudo fakeroot autoconf automake patch
   libelf gcc gcc-fortran gcc-objc vala rust bison flex cython go dlang-dmd
   mono boost qt5-base gtkmm3 gtest gmock protobuf wxgtk2 gobject-introspection
@@ -17,7 +19,6 @@ pkgs=(
 )
 
 aur_pkgs=(scalapack)
-pip_pkgs=(gcovr)
 cleanup_pkgs=(go)
 
 AUR_USER=docker
@@ -30,7 +31,7 @@ sed -i "s,PKGEXT='.pkg.tar.zst',PKGEXT='.pkg.tar',g" /etc/makepkg.conf
 
 # Install packages
 pacman -Syu $PACMAN_OPTS "${pkgs[@]}"
-python -m pip install "${pip_pkgs[@]}"
+install_python_packages
 
 # Setup the user
 useradd -m $AUR_USER
diff --git a/ci/ciimage/bionic/install.sh b/ci/ciimage/bionic/install.sh
index 0bfcdfb..4dea73b 100755
--- a/ci/ciimage/bionic/install.sh
+++ b/ci/ciimage/bionic/install.sh
@@ -2,12 +2,13 @@
 
 set -e
 
+source /ci/common.sh
+
 export DEBIAN_FRONTEND=noninteractive
 export LANG='C.UTF-8'
 export DC=gdc
 
 pkgs=(
-  python3-pytest-xdist
   python3-pip libxml2-dev libxslt1-dev libyaml-dev libjson-glib-dev
   wget unzip cmake doxygen
   clang
@@ -46,7 +47,7 @@ done
 # packages
 eatmydata apt-get -y install "${pkgs[@]}"
 
-eatmydata python3 -m pip install codecov gcovr jsonschema
+install_python_packages
 
 # Install the ninja 0.10
 wget https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-linux.zip
diff --git a/ci/ciimage/common.sh b/ci/ciimage/common.sh
index c8940df..707b751 100644
--- a/ci/ciimage/common.sh
+++ b/ci/ciimage/common.sh
@@ -8,6 +8,23 @@
 ###
 
 set -e
+set -x
+
+base_python_pkgs=(
+  pytest
+  pytest-xdist
+  coverage
+  codecov
+  jsonschema
+)
+
+python_pkgs=(
+  cython
+  gobject
+  PyGObject
+  lxml
+  gcovr
+)
 
 dub_fetch() {
   set +e
@@ -20,3 +37,11 @@ dub_fetch() {
   done
   set -e
 }
+
+install_minimal_python_packages() {
+  python3 -m pip install "${base_python_pkgs[@]}" $*
+}
+
+install_python_packages() {
+  python3 -m pip install "${base_python_pkgs[@]}" "${python_pkgs[@]}" $*
+}
diff --git a/ci/ciimage/cuda/install.sh b/ci/ciimage/cuda/install.sh
index 011099d..0d412e0 100755
--- a/ci/ciimage/cuda/install.sh
+++ b/ci/ciimage/cuda/install.sh
@@ -2,8 +2,10 @@
 
 set -e
 
+source /ci/common.sh
+
 pkgs=(
-  python python-setuptools python-wheel python-pytest-xdist python-jsonschema
+  python python-pip
   ninja gcc gcc-objc git cmake
   cuda zlib pkgconf
 )
@@ -11,6 +13,7 @@ pkgs=(
 PACMAN_OPTS='--needed --noprogressbar --noconfirm'
 
 pacman -Syu $PACMAN_OPTS "${pkgs[@]}"
+install_minimal_python_packages
 
 # Manually remove cache to avoid GitHub space restrictions
 rm -rf /var/cache/pacman
diff --git a/ci/ciimage/fedora/install.sh b/ci/ciimage/fedora/install.sh
index 58422c4..df1d853 100755
--- a/ci/ciimage/fedora/install.sh
+++ b/ci/ciimage/fedora/install.sh
@@ -2,9 +2,11 @@
 
 set -e
 
+source /ci/common.sh
+
 pkgs=(
-  python python-setuptools python-wheel python-pip python-pytest-xdist python3-devel
-  ninja-build make git autoconf automake patch python3-Cython python3-jsonschema
+  python python-pip python3-devel
+  ninja-build make git autoconf automake patch
   elfutils gcc gcc-c++ gcc-fortran gcc-objc gcc-objc++ vala rust bison flex ldc libasan libasan-static
   mono-core boost-devel gtkmm30 gtest-devel gmock-devel protobuf-devel wxGTK3-devel gobject-introspection
   boost-python3-devel
@@ -13,7 +15,7 @@ pkgs=(
   doxygen vulkan-devel vulkan-validation-layers-devel openssh mercurial gtk-sharp2-devel libpcap-devel gpgme-devel
   qt5-qtbase-devel qt5-qttools-devel qt5-linguist qt5-qtbase-private-devel
   libwmf-devel valgrind cmake openmpi-devel nasm gnustep-base-devel gettext-devel ncurses-devel
-  libxml2-devel libxslt-devel libyaml-devel glib2-devel json-glib-devel python3-lxml libgcrypt-devel
+  libxml2-devel libxslt-devel libyaml-devel glib2-devel json-glib-devel libgcrypt-devel
 )
 
 # Sys update
@@ -21,7 +23,7 @@ dnf -y upgrade
 
 # Install deps
 dnf -y install "${pkgs[@]}"
-python3 -m pip install hotdoc gcovr gobject PyGObject
+install_python_packages hotdoc
 
 # Cleanup
 dnf -y clean all
diff --git a/ci/ciimage/opensuse/install.sh b/ci/ciimage/opensuse/install.sh
index 4c8e770..41cb961 100755
--- a/ci/ciimage/opensuse/install.sh
+++ b/ci/ciimage/opensuse/install.sh
@@ -5,8 +5,8 @@ set -e
 source /ci/common.sh
 
 pkgs=(
-  python3-setuptools python3-wheel python3-pip python3-pytest-xdist python3 python3-lxml
-  ninja make git autoconf automake patch python3-Cython python3-jsonschema
+  python3-pip python3 python3-devel
+  ninja make git autoconf automake patch libjpeg-devel
   elfutils gcc gcc-c++ gcc-fortran gcc-objc gcc-obj-c++ vala rust bison flex curl lcov
   mono-core gtkmm3-devel gtest gmock protobuf-devel wxGTK3-3_2-devel gobject-introspection-devel
   itstool gtk3-devel java-15-openjdk-devel gtk-doc llvm-devel clang-devel libSDL2-devel graphviz-devel zlib-devel zlib-devel-static
@@ -26,7 +26,7 @@ zypper --non-interactive update
 
 # Install deps
 zypper install -y "${pkgs[@]}"
-python3 -m pip install hotdoc gcovr gobject PyGObject
+install_python_packages hotdoc
 
 echo 'export PKG_CONFIG_PATH="/usr/lib64/mpi/gcc/openmpi3/lib64/pkgconfig:$PKG_CONFIG_PATH"' >> /ci/env_vars.sh
 
diff --git a/ci/ciimage/ubuntu-rolling/install.sh b/ci/ciimage/ubuntu-rolling/install.sh
index da31766..770fd85 100755
--- a/ci/ciimage/ubuntu-rolling/install.sh
+++ b/ci/ciimage/ubuntu-rolling/install.sh
@@ -9,11 +9,9 @@ export LANG='C.UTF-8'
 export DC=gdc
 
 pkgs=(
-  python3-pytest-xdist python3-jsonschema
   python3-pip libxml2-dev libxslt1-dev libyaml-dev libjson-glib-dev
-  python3-lxml
   wget unzip
-  qt5-default clang
+  qt5-qmake qtbase5-dev qtchooser qtbase5-dev-tools clang
   pkg-config-arm-linux-gnueabihf
   libomp-dev
   llvm lcov
@@ -42,7 +40,7 @@ eatmydata apt-get -y build-dep meson
 eatmydata apt-get -y install "${pkgs[@]}"
 eatmydata apt-get -y install --no-install-recommends wine-stable  # Wine is special
 
-eatmydata python3 -m pip install hotdoc codecov gcovr
+install_python_packages hotdoc
 
 # dub stuff
 dub_fetch urld
diff --git a/ci/ciimage/ubuntu-rolling/test.sh b/ci/ciimage/ubuntu-rolling/test.sh
index d00df6f..f6956bb 100755
--- a/ci/ciimage/ubuntu-rolling/test.sh
+++ b/ci/ciimage/ubuntu-rolling/test.sh
@@ -9,4 +9,4 @@ testFN() {
 
 testFN
 false
-exit 0
\ No newline at end of file
+exit 0