ci: replace glslangValidator with 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/11096>
This commit is contained in:
Andres Gomez 2021-05-31 21:41:58 +03:00
parent 5f102f7b02
commit d71584aec3
2 changed files with 2 additions and 7 deletions

View File

@ -297,7 +297,7 @@ x86_build-base:
- .fdo.container-build@debian
- .container
variables:
MESA_IMAGE_TAG: &x86_build-base "2021-03-31-bullseye"
MESA_IMAGE_TAG: &x86_build-base "2021-05-31-glslang-tools"
.use-x86_build-base:
extends:

View File

@ -29,6 +29,7 @@ apt-get install -y --no-remove \
g++-mingw-w64-x86-64 \
gcc \
git \
glslang-tools \
kmod \
libclang-11-dev \
libclang-9-dev \
@ -76,12 +77,6 @@ apt-get install -y --no-remove \
# Needed for ci-fairy, this revision is able to upload files to MinIO
pip3 install git+http://gitlab.freedesktop.org/freedesktop/ci-templates@6f5af7e5574509726c79109e3c147cee95e81366
# for the vulkan overlay layer and ACO tests
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
############### Uninstall ephemeral packages