aboutsummaryrefslogtreecommitdiff
path: root/ci/ciimage
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-04-28 01:36:44 +0300
committerGitHub <noreply@github.com>2020-04-28 01:36:44 +0300
commit34e7e8780c0196313be8700f504ec84fd6cba3d1 (patch)
treea93fa9cb431f518bd9b1edb0191b1a839d03bd9b /ci/ciimage
parent7c68fe80083fd72a100998578417b223e3704af5 (diff)
parent97f7e3d83cdafbd94d4a164582ea71035c996baa (diff)
downloadmeson-34e7e8780c0196313be8700f504ec84fd6cba3d1.zip
meson-34e7e8780c0196313be8700f504ec84fd6cba3d1.tar.gz
meson-34e7e8780c0196313be8700f504ec84fd6cba3d1.tar.bz2
Merge pull request #7018 from dcbaker/junit
mtest: Generate JUnit results for tests
Diffstat (limited to 'ci/ciimage')
-rwxr-xr-xci/ciimage/arch/install.sh2
-rwxr-xr-xci/ciimage/eoan/install.sh1
-rwxr-xr-xci/ciimage/fedora/install.sh2
-rwxr-xr-xci/ciimage/opensuse/install.sh4
4 files changed, 5 insertions, 4 deletions
diff --git a/ci/ciimage/arch/install.sh b/ci/ciimage/arch/install.sh
index 7fe139e..6cbbb27 100755
--- a/ci/ciimage/arch/install.sh
+++ b/ci/ciimage/arch/install.sh
@@ -12,7 +12,7 @@ pkgs=(
itstool gtk3 java-environment=8 gtk-doc llvm clang sdl2 graphviz
doxygen vulkan-validation-layers openssh mercurial gtk-sharp-2 qt5-tools
libwmf valgrind cmake netcdf-fortran openmpi nasm gnustep-base gettext
- python-jsonschema
+ python-jsonschema python-lxml
# cuda
)
diff --git a/ci/ciimage/eoan/install.sh b/ci/ciimage/eoan/install.sh
index 4b3b746..7d7a1fd 100755
--- a/ci/ciimage/eoan/install.sh
+++ b/ci/ciimage/eoan/install.sh
@@ -11,6 +11,7 @@ export DC=gdc
pkgs=(
python3-pytest-xdist
python3-pip libxml2-dev libxslt1-dev libyaml-dev libjson-glib-dev
+ python3-lxml
wget unzip
qt5-default clang
pkg-config-arm-linux-gnueabihf
diff --git a/ci/ciimage/fedora/install.sh b/ci/ciimage/fedora/install.sh
index 242d677..f61d97e 100755
--- a/ci/ciimage/fedora/install.sh
+++ b/ci/ciimage/fedora/install.sh
@@ -13,7 +13,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
+ libxml2-devel libxslt-devel libyaml-devel glib2-devel json-glib-devel python3-lxml
)
# Sys update
diff --git a/ci/ciimage/opensuse/install.sh b/ci/ciimage/opensuse/install.sh
index c5dd6df..7c90ec3 100755
--- a/ci/ciimage/opensuse/install.sh
+++ b/ci/ciimage/opensuse/install.sh
@@ -5,7 +5,7 @@ set -e
source /ci/common.sh
pkgs=(
- python3-setuptools python3-wheel python3-pip python3-pytest-xdist python3
+ python3-setuptools python3-wheel python3-pip python3-pytest-xdist python3 python3-lxml
ninja make git autoconf automake patch python3-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
@@ -17,7 +17,7 @@ pkgs=(
libxml2-devel libxslt-devel libyaml-devel glib2-devel json-glib-devel
boost-devel libboost_date_time-devel libboost_filesystem-devel libboost_locale-devel libboost_system-devel
libboost_test-devel libboost_log-devel libboost_regex-devel
- libboost_python-devel libboost_python-py3-1_71_0-devel libboost_regex-devel
+ libboost_python-py3-1_71_0-devel libboost_regex-devel
)
# Sys update