ci: Use --no-install-recommends to avoid problems with --no-remove

Some packages that are being installed via recommends are conflicting
with already installed packages, causing this error:

E: Packages need to be removed but remove is disabled.

We dont need these packages, so don't install them.

Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18467>

diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh
index e5db3a0..f0a27b4 100644 (file)
--- a/.gitlab-ci/container/cross_build.sh
+++ b/.gitlab-ci/container/cross_build.sh
@@ -48,7 +48,7 @@ if [[ $arch != "armhf" ]]; then
     # llvm-*-tools:$arch conflicts with python3:amd64. Install dependencies only
     # with apt-get, then force-install llvm-*-{dev,tools}:$arch with dpkg to get
     # around this.
-    apt-get install -y --no-remove \
+    apt-get install -y --no-remove --no-install-recommends \
             libclang-cpp${LLVM}:$arch \
             libffi-dev:$arch \
             libgcc-s1:$arch \

diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh
index 3922bcc..1b55af8 100644 (file)
--- a/.gitlab-ci/container/debian/x86_test-vk.sh
+++ b/.gitlab-ci/container/debian/x86_test-vk.sh
@@ -50,7 +50,7 @@ STABLE_EPHEMERAL=" \
       xz-utils \
       "
 
-apt-get install -y --no-remove \
+apt-get install -y --no-remove --no-install-recommends \
       $STABLE_EPHEMERAL \
       libepoxy0 \
       libxcb-shm0 \