gitlab-ci: reuse container_post_build when building the test images

[mesa.git] / .gitlab-ci / container / x86_test-vk.sh

diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index 670f9e2b0b1e4ec7425d4371e34f734a859e333c..c1d31b2d5cd37b1888b5ac358f9b675cd8a23d08 100644 (file)
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -10,17 +10,16 @@ STABLE_EPHEMERAL=" \
       ccache \
       cmake \
       g++ \
-      gcc \
       libgbm-dev \
       libgles2-mesa-dev \
       liblz4-dev \
       libpng-dev \
       libvulkan-dev \
       libxcb-ewmh-dev \
-      libxcb-keysyms1-dev \
       libxkbcommon-dev \
       libxrandr-dev \
       libxrender-dev \
+      libzstd-dev \
       meson \
       p7zip \
       pkg-config \
@@ -28,16 +27,16 @@ STABLE_EPHEMERAL=" \
       wget \
       "
 
-TESTING_EPHEMERAL=" \
-      libc6-dev \
-      "
-
-apt-get update
-
+# Unfortunately, gfxreconstruct needs the -dev packages:
+# https://github.com/LunarG/gfxreconstruct/issues/402
 apt-get install -y --no-remove \
+      libwayland-dev \
+      libx11-xcb-dev \
+      libxcb-keysyms1-dev \
+      libxcb1-dev \
       $STABLE_EPHEMERAL
 
-        # We need multiarch for Wine
+# We need multiarch for Wine
 dpkg --add-architecture i386
 
 apt-get update
@@ -47,10 +46,6 @@ apt-get install -y --no-remove \
       wine32 \
       wine64
 
-# Install packages we need from Debian testing last, to avoid pulling in more
-apt-get install -y -t testing \
-      $TESTING_EPHEMERAL
-
 
 ############### Set up Wine env variables
 
@@ -134,10 +129,7 @@ wine \
 
 ############### Uninstall the build software
 
-ccache --show-stats
-
 apt-get purge -y \
-      $STABLE_EPHEMERAL \
-      $TESTING_EPHEMERAL
+      $STABLE_EPHEMERAL
 
-apt-get autoremove -y --purge
+. .gitlab-ci/container/container_post_build.sh