From 1fc1b877622e3477272a17a43fd438453484bb79 Mon Sep 17 00:00:00 2001 From: Michel Dänzer Date: Tue, 26 May 2020 11:04:19 +0200 Subject: gitlab-ci: Pull in GCC 9 from Debian testing in x86_test-gl/vk images The GCC 8 packages from buster are no longer compatible with libc6 from testing. We could use the GCC 8 packages from testing instead, but this is easier. v2: * Update piglit-quick_gl test results, due to the piglit issue fixed by https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/294 Reviewed-by: Eric Anholt # v1 Part-of: --- .gitlab-ci/container/x86_test-gl.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '.gitlab-ci/container/x86_test-gl.sh') diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh index a98e165b8dc..4ce0dc37616 100644 --- a/.gitlab-ci/container/x86_test-gl.sh +++ b/.gitlab-ci/container/x86_test-gl.sh @@ -11,8 +11,6 @@ STABLE_EPHEMERAL=" \ automake \ ccache \ cmake \ - g++ \ - gcc \ libgbm-dev \ libgles2-mesa-dev \ libpcre3-dev \ @@ -33,6 +31,7 @@ STABLE_EPHEMERAL=" \ " TESTING_EPHEMERAL=" \ + g++ \ libc6-dev \ " -- cgit v1.2.3