diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-07 17:20:02 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-06-11 11:10:55 +0200 |
| commit | 25f2d8826e7c99d3e022e5774ff4530c2af5b0ba (patch) | |
| tree | ff822df754380dde5d1843225985fb80b76b8d31 /ci/ciimage/ubuntu-rolling | |
| parent | 1ab0694556b6c0117b7b5072ec906dee2029adec (diff) | |
| download | meson-25f2d8826e7c99d3e022e5774ff4530c2af5b0ba.tar.gz | |
ci: Fix CI image builder
Diffstat (limited to 'ci/ciimage/ubuntu-rolling')
| -rwxr-xr-x | ci/ciimage/ubuntu-rolling/install.sh | 6 | ||||
| -rwxr-xr-x | ci/ciimage/ubuntu-rolling/test.sh | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ci/ciimage/ubuntu-rolling/install.sh b/ci/ciimage/ubuntu-rolling/install.sh index da31766a2..770fd8531 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 d00df6f99..f6956bb60 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 |