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

ci: remove glslangValidator installation from the VK test container 

We already include glslang-tools.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11095>
This commit is contained in:
Andres Gomez 2021-05-31 20:50:30 +03:00 committed by Marge Bot
parent 1199d86b2c
commit 5f102f7b02
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -421,7 +421,7 @@ x86_test-gl:
x86_test-vk:
extends: .use-x86_test-base
variables:
MESA_IMAGE_TAG: &x86_test-vk "2021-05-22-vkd3d-proton-tests"
MESA_IMAGE_TAG: &x86_test-vk "2021-05-31-glslangValidator"
# Debian 11 based ARM build image
arm_build:

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

@ -117,13 +117,6 @@ wine \
/d "C:\windows\system32;C:\windows;C:\windows\system32\wbem;Z:\apitrace-msvc-win64\bin" \
/f
############### Install glslang (needed for building VKD3D-Proton)
wget https://github.com/KhronosGroup/glslang/releases/download/SDK-candidate-26-Jul-2020/glslang-master-linux-Release.zip
unzip glslang-master-linux-Release.zip bin/glslangValidator
install -m755 bin/glslangValidator /usr/local/bin/
rm bin/glslangValidator glslang-master-linux-Release.zip
############### Building ...
. .gitlab-ci/container/container_pre_build.sh