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 4f8f306ee9fa275bddf4f6956101e8c93f92df5c..c1d31b2d5cd37b1888b5ac358f9b675cd8a23d08 100644 (file)
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -16,10 +16,10 @@ STABLE_EPHEMERAL=" \
       libpng-dev \
       libvulkan-dev \
       libxcb-ewmh-dev \
-      libxcb-keysyms1-dev \
       libxkbcommon-dev \
       libxrandr-dev \
       libxrender-dev \
+      libzstd-dev \
       meson \
       p7zip \
       pkg-config \
@@ -27,7 +27,13 @@ STABLE_EPHEMERAL=" \
       wget \
       "
 
+# 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
@@ -123,9 +129,7 @@ wine \
 
 ############### Uninstall the build software
 
-ccache --show-stats
-
 apt-get purge -y \
       $STABLE_EPHEMERAL
 
-apt-get autoremove -y --purge
+. .gitlab-ci/container/container_post_build.sh