From c1e69570331183987dd4d490fd12acdf94982953 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Wed, 19 Aug 2020 17:18:43 +0300 Subject: [PATCH] Revert "gitlab-ci: reuse container_post_build when building the test images" ccache is installed as ephemeral. Hence, the build will fail if used by the post_build script after removing it. This reverts commit 40ab6d77c06fe5c0882fe3320583a6a2b1355eab. Signed-off-by: Andres Gomez Acked-by: Daniel Stone Part-of: --- .gitlab-ci/container/x86_test-gl.sh | 4 +++- .gitlab-ci/container/x86_test-vk.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh index e1d80ad7067..aaed8ec1459 100644 --- a/.gitlab-ci/container/x86_test-gl.sh +++ b/.gitlab-ci/container/x86_test-gl.sh @@ -69,7 +69,9 @@ apt-get install -y --no-remove \ ############### Uninstall the build software +ccache --show-stats + apt-get purge -y \ $STABLE_EPHEMERAL -. .gitlab-ci/container/container_post_build.sh +apt-get autoremove -y --purge diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index c1d31b2d5cd..c3228071015 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -129,7 +129,9 @@ wine \ ############### Uninstall the build software +ccache --show-stats + apt-get purge -y \ $STABLE_EPHEMERAL -. .gitlab-ci/container/container_post_build.sh +apt-get autoremove -y --purge -- 2.30.2