diff options
| author | Michel Dänzer <[email protected]> | 2020-05-26 11:04:19 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-28 08:01:24 +0000 |
| commit | 1fc1b877622e3477272a17a43fd438453484bb79 (patch) | |
| tree | 098e0a69acf55bec589f94353e142aba76039c6a /.gitlab-ci/container/x86_test-gl.sh | |
| parent | c2366f01fd194c9aef91153e3050af30c57bb95a (diff) | |
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 <[email protected]> # v1
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5186>
Diffstat (limited to '.gitlab-ci/container/x86_test-gl.sh')
| -rw-r--r-- | .gitlab-ci/container/x86_test-gl.sh | 3 |
1 files changed, 1 insertions, 2 deletions
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 \ " |