KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <eric@anholt.net> # v1
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5186>
This commit is contained in:
Michel Dänzer 2020-05-26 11:04:19 +02:00 committed by Marge Bot
parent c2366f01fd
commit 1fc1b87762
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -150,7 +150,7 @@ x86_build:
x86_test-base:
extends: x86_build
variables:
FDO_DISTRIBUTION_TAG: &x86_test-base "2020-05-23"
FDO_DISTRIBUTION_TAG: &x86_test-base "2020-05-26"
.use-x86_test-base:
extends:
@ -167,13 +167,13 @@ x86_test-base:
x86_test-gl:
extends: .use-x86_test-base
variables:
FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-05-23"
FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-05-26"
# Debian 10 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-05-23"
FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-05-26"
# Debian 9 based x86 build image (old LLVM)
x86_build_old:

3
.gitlab-ci/container/x86_test-gl.sh
View File

@ -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 \
"

3
.gitlab-ci/container/x86_test-vk.sh
View File

@ -9,8 +9,6 @@ export DEBIAN_FRONTEND=noninteractive
STABLE_EPHEMERAL=" \
ccache \
cmake \
g++ \
gcc \
libgbm-dev \
libgles2-mesa-dev \
liblz4-dev \
@ -29,6 +27,7 @@ STABLE_EPHEMERAL=" \
"
TESTING_EPHEMERAL=" \
g++ \
libc6-dev \
"

12
.gitlab-ci/piglit/quick_gl.txt
View File

@ -1573,10 +1573,8 @@ spec/intel_conservative_rasterization/intel_conservative_rasterization-invalid:
spec/intel_conservative_rasterization/intel_conservative_rasterization-invalid_gles3: skip
spec/intel_conservative_rasterization/intel_conservative_rasterization-tri: skip
spec/intel_conservative_rasterization/intel_conservative_rasterization-tri_gles3: skip
spec/khr_texture_compression_astc/array-gl/12x12 block dim: fail
spec/khr_texture_compression_astc/array-gl/5x5 block dim: fail
spec/khr_texture_compression_astc/array-gles/12x12 block dim: fail
spec/khr_texture_compression_astc/array-gles/5x5 block dim: fail
spec/khr_texture_compression_astc/array-gl: skip
spec/khr_texture_compression_astc/array-gles: skip
spec/khr_texture_compression_astc/miptree-gl hdr/hdr: notrun
spec/khr_texture_compression_astc/miptree-gl ldr/ldr: notrun
spec/khr_texture_compression_astc/miptree-gl ldr/ldr profile: fail
@ -1713,9 +1711,9 @@ summary:
name: results
---- --------
pass: 20703
fail: 222
fail: 218
crash: 0
skip: 1465
skip: 1467
timeout: 0
warn: 6
incomplete: 0
@ -1724,4 +1722,4 @@ summary:
changes: 0
fixes: 0
regressions: 0
total: 22414
total: 22412