mirror of https://gitlab.freedesktop.org/mesa/mesa
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:512f1c160a
("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> (cherry picked from commit3c64f3dcbc
)
This commit is contained in:
parent
d912fa4e4f
commit
f655af3782
|
@ -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
|
||||
|
|
|
@ -994,7 +994,7 @@
|
|||
"description": "ci: rework vulkan validation layer build script",
|
||||
"nominated": true,
|
||||
"nomination_type": 1,
|
||||
"resolution": 0,
|
||||
"resolution": 1,
|
||||
"main_sha": null,
|
||||
"because_sha": "512f1c160a63a7ba1b0097166d8ec0324542d639"
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue