diff options
| author | Eric Engestrom <eric@igalia.com> | 2023-04-13 20:29:12 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-04-20 20:22:14 +0000 |
| commit | 3c64f3dcbca003689b4c982d0cb13e5098bbe3cb (patch) | |
| tree | 1229f4d014c3c1c60bd5f062d0ba9aa06eee855a /.gitlab-ci | |
| parent | fcb72ffd0c61e2b3226306fae37b85ab4982a39e (diff) | |
| download | mesa-3c64f3dcbca003689b4c982d0cb13e5098bbe3cb.tar.gz | |
ci: rework vulkan validation layer build script
Initially this was just adding a missing popd, but actually there's no
reason to pushd into the build dir, so let's just pass the build dir as
arguments to cmake & ninja instead.
`--arch x64` was also dropped as it only applies to Windows builds,
which this script doesn't support anyway.
Fixes: 512f1c160a63a7ba1b00 ("ci/zink: Add coverage using the vulkan validation layer on lvp.")
Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22488>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/build-vulkan-validation.sh | 12 | ||||
| -rw-r--r-- | .gitlab-ci/image-tags.yml | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab-ci/container/build-vulkan-validation.sh b/.gitlab-ci/container/build-vulkan-validation.sh index ead6c127f50..572fa71f698 100644 --- a/.gitlab-ci/container/build-vulkan-validation.sh +++ b/.gitlab-ci/container/build-vulkan-validation.sh @@ -1,15 +1,17 @@ #!/usr/bin/env bash +# When changing this file, you need to bump the following +# .gitlab-ci/image-tags.yml tags: +# DEBIAN_X86_TEST_GL_TAG + set -ex VALIDATION_TAG="v1.3.238" git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git pushd Vulkan-ValidationLayers -mkdir build -pushd build -python3 ../scripts/update_deps.py --dir ../external --arch x64 --config debug -cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=OFF -DBUILD_WERROR=OFF -C ../external/helper.cmake .. -ninja install +python3 scripts/update_deps.py --dir external --config debug +cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=OFF -DBUILD_WERROR=OFF -C external/helper.cmake -S . -B build +ninja -C build install popd rm -rf Vulkan-ValidationLayers diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 04033278dc9..0d481f4998d 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -16,7 +16,7 @@ variables: DEBIAN_X86_TEST_ANDROID_IMAGE_PATH: "debian/x86_test-android" DEBIAN_X86_TEST_ANDROID_TAG: "2023-04-12-deqp-egl" - DEBIAN_X86_TEST_GL_TAG: "2023-04-14-dxvk-2.1-1" + DEBIAN_X86_TEST_GL_TAG: "2023-04-18-vulkan-validation-layer" DEBIAN_X86_TEST_VK_TAG: "2023-04-14-dxvk-2.1-1" ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump" |