gitlab-ci: Merge ccache and libxml2-utils into main apt-get install

The motivation for this is that we want to make use of the meson cross
files in this script, which have the ccache compiler paths.

We need to remove the ccache directory at the end, it would just waste
space in the image for no benefit.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3643>

diff --git a/.gitlab-ci/container/x86_build.sh b/.gitlab-ci/container/x86_build.sh
index de00504742462b0d9123626a3f2ab0240f788304..a66b1dd4a09ba0f87479a169c5b2a0e45d4b9831 100644 (file)
--- a/.gitlab-ci/container/x86_build.sh
+++ b/.gitlab-ci/container/x86_build.sh
@@ -39,6 +39,7 @@ apt-get install -y --no-remove \
       automake \
       autotools-dev \
       bison \
+      ccache \
       clang-9 \
       cmake \
       flex \
@@ -67,6 +68,7 @@ apt-get install -y --no-remove \
       libx11-xcb-dev \
       libxdamage-dev \
       libxext-dev \
+      libxml2-utils \
       libxrandr-dev \
       libxrender-dev \
       libxshmfence-dev \
@@ -181,12 +183,6 @@ cd shader-db
 make -j4
 popd
 
-# Use ccache to speed up builds
-apt-get install -y --no-remove ccache
-
-# We need xmllint to validate the XML files in Mesa
-apt-get install -y --no-remove libxml2-utils
-
 
 # Generate cross build files for Meson
 for arch in $CROSS_ARCHITECTURES; do
@@ -203,6 +199,10 @@ for arch in $CROSS_ARCHITECTURES; do
 done
 
 
+# Remove ccache directory, useless for the build jobs
+rm -rf $(ccache --get-config=cache_dir)
+
+
 ############### Uninstall the build software
 
 apt-get purge -y \