From 5f102f7b02ec15001fad8fbad6afed6c17f5b1c6 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Mon, 31 May 2021 20:50:30 +0300 Subject: [PATCH] ci: remove glslangValidator installation from the VK test container We already include glslang-tools. Signed-off-by: Andres Gomez Reviewed-by: Erik Faye-Lund Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/container/x86_test-vk.sh | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94357cb2128..a477bc581cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index a03f2ae2807..307d7e37429 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -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