summaryrefslogtreecommitdiff
path: root/ci/ciimage/fedora
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2021-06-07 17:20:02 +0200
committerDaniel Mensinger <daniel@mensinger-ka.de>2021-06-11 11:10:55 +0200
commit25f2d8826e7c99d3e022e5774ff4530c2af5b0ba (patch)
treeff822df754380dde5d1843225985fb80b76b8d31 /ci/ciimage/fedora
parent1ab0694556b6c0117b7b5072ec906dee2029adec (diff)
downloadmeson-25f2d8826e7c99d3e022e5774ff4530c2af5b0ba.tar.gz
ci: Fix CI image builder
Diffstat (limited to 'ci/ciimage/fedora')
-rwxr-xr-xci/ciimage/fedora/install.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/ci/ciimage/fedora/install.sh b/ci/ciimage/fedora/install.sh
index 58422c4b6..df1d853cd 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