diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-03-24 11:02:00 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-04-02 09:47:06 +0200 |
| commit | 934863ba3b491d5931542c1321576ce582dbaa72 (patch) | |
| tree | 075f23c61dfa093d961ef7ac181a451b01f9bc3f /ci | |
| parent | aee02c9bec49ca0ac972c0710c76382b9484eb65 (diff) | |
| download | meson-934863ba3b491d5931542c1321576ce582dbaa72.zip meson-934863ba3b491d5931542c1321576ce582dbaa72.tar.gz meson-934863ba3b491d5931542c1321576ce582dbaa72.tar.bz2 | |
ci: Added python-jsonschema to docker images
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/ciimage/arch/install.sh | 6 | ||||
| -rwxr-xr-x | ci/ciimage/fedora/install.sh | 2 | ||||
| -rwxr-xr-x | ci/ciimage/opensuse/install.sh | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ci/ciimage/arch/install.sh b/ci/ciimage/arch/install.sh index f7f0f6d..1aeb85c 100755 --- a/ci/ciimage/arch/install.sh +++ b/ci/ciimage/arch/install.sh @@ -3,7 +3,7 @@ # 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 python-setuptools python-wheel python-pip python-pytest-xdist python-gobject python-jsonschema 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 wxgtk gobject-introspection @@ -13,7 +13,8 @@ pkgs=( # cuda ) -aur_pkgs=(hotdoc scalapack) +aur_pkgs=(scalapack) +pip_pkgs=(hotdoc) cleanup_pkgs=(go) AUR_USER=docker @@ -26,6 +27,7 @@ sed -i "s,PKGEXT='.pkg.tar.xz',PKGEXT='.pkg.tar',g" /etc/makepkg.conf # Install packages pacman -Syu $PACMAN_OPTS "${pkgs[@]}" +python -m pip install "${pip_pkgs[@]}" # Setup the user useradd -m $AUR_USER diff --git a/ci/ciimage/fedora/install.sh b/ci/ciimage/fedora/install.sh index fd4c558..e1544fa 100755 --- a/ci/ciimage/fedora/install.sh +++ b/ci/ciimage/fedora/install.sh @@ -2,7 +2,7 @@ pkgs=( python python-setuptools python-wheel python-pip python-pytest-xdist pygobject3 python3-devel python2-devel - ninja-build make git autoconf automake patch python3-Cython python2-Cython + ninja-build make git autoconf automake patch python3-Cython python2-Cython python3-jsonschema 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 boost-python2-devel diff --git a/ci/ciimage/opensuse/install.sh b/ci/ciimage/opensuse/install.sh index b30b208..5cb61ec 100755 --- a/ci/ciimage/opensuse/install.sh +++ b/ci/ciimage/opensuse/install.sh @@ -2,7 +2,7 @@ pkgs=( python3-setuptools python3-wheel python3-pip python3-pytest-xdist python3 python2 - ninja make git autoconf automake patch python3-Cython python2-Cython + ninja make git autoconf automake patch python3-Cython python2-Cython python3-jsonschema elfutils gcc gcc-c++ gcc-fortran gcc-objc gcc-obj-c++ vala rust bison flex curl mono-core gtkmm3-devel gtest gmock protobuf-devel wxGTK3-3_2-devel gobject-introspection-devel itstool gtk3-devel java-13-openjdk-devel gtk-doc llvm-devel clang-devel libSDL2-devel graphviz-devel zlib-devel zlib-devel-static |