diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-12-05 13:16:10 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-02-25 13:04:20 +0000 |
| commit | 52c881487ddc0fe356af23d3834ba24bb8eb52ba (patch) | |
| tree | 112f28ac6375cc5cf8c547b40598d3ee36878fa5 | |
| parent | 787b9e963347dd26804dabe466038b0329efe0fc (diff) | |
| download | dbus-52c881487ddc0fe356af23d3834ba24bb8eb52ba.tar.gz | |
CI: Don't install weak dependencies (Recommends)
In particular this avoids installing the TeX toolchain.
However, this also means we don't install dbus, which broke some tests
in minimal containers where dbus wasn't already installed, because the
messagebus user wouldn't have been created. Make sure that user exists,
using the same adduser call as the Debian dbus package.
CMake really wants to find a C++ compiler (even though we only use C++
when compiling for Windows), so explicitly install the default
version of the GNU C++ compiler, g++.
Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit cb6abc63919d6f84f634aee94d20c53d2759c382)
| -rwxr-xr-x | tools/ci-install.sh | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 783b34bb..5efc8578 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -120,14 +120,14 @@ case "$ci_distro" in case "$ci_host" in (i686-w64-mingw32) - $sudo apt-get -qq -y install \ + $sudo apt-get -qq -y --no-install-recommends install \ binutils-mingw-w64-i686 \ g++-mingw-w64-i686 \ $wine32 \ ${NULL} ;; (x86_64-w64-mingw32) - $sudo apt-get -qq -y install \ + $sudo apt-get -qq -y --no-install-recommends install \ binutils-mingw-w64-x86-64\ g++-mingw-w64-x86-64 \ $wine64 \ @@ -135,7 +135,8 @@ case "$ci_distro" in ;; esac - $sudo apt-get -qq -y install \ + $sudo apt-get -qq -y --no-install-recommends install \ + adduser \ autoconf-archive \ automake \ autotools-dev \ @@ -146,6 +147,8 @@ case "$ci_distro" in dh-exec \ doxygen \ dpkg-dev \ + g++ \ + gcc \ gnome-desktop-testing \ libapparmor-dev \ libaudit-dev \ @@ -158,6 +161,7 @@ case "$ci_distro" in python \ python-dbus \ python-gi \ + sudo \ valgrind \ wget \ xauth \ @@ -166,11 +170,15 @@ case "$ci_distro" in xvfb \ ${NULL} + # Make sure we have a messagebus user, even if the dbus package + # isn't installed + $sudo adduser --system --quiet --home /nonexistent --no-create-home \ + --disabled-password --group messagebus + if [ "$ci_in_docker" = yes ]; then # Add the user that we will use to do the build inside the # Docker container, and let them use sudo adduser --disabled-password user </dev/null - apt-get -y install sudo echo "user ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/nopasswd chmod 0440 /etc/sudoers.d/nopasswd fi @@ -190,7 +198,7 @@ case "$ci_distro" in (*) # assume Ubuntu 18.04 'bionic', Debian 10 'buster' or newer - $sudo apt-get -qq -y install ducktype + $sudo apt-get -qq -y --no-install-recommends install ducktype ;; esac ;; |