OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: rework vulkan validation layer build script

Browse Source 
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>
This commit is contained in:
Eric Engestrom
2023-04-13 20:29:12 +01:00
committed by Marge Bot
parent fcb72ffd0c
commit 3c64f3dcbc
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci/container/build-vulkan-validation.sh
View File

@@ -1,15 +1,17 @@
#!/usr/bin/env bash #!/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 set -ex
VALIDATION_TAG="v1.3.238" VALIDATION_TAG="v1.3.238"
git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git
pushd Vulkan-ValidationLayers pushd Vulkan-ValidationLayers
mkdir build python3 scripts/update_deps.py --dir external --config debug
pushd build cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=OFF -DBUILD_WERROR=OFF -C external/helper.cmake -S . -B build
python3 ../scripts/update_deps.py --dir ../external --arch x64 --config debug ninja -C build install
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=OFF -DBUILD_WERROR=OFF -C ../external/helper.cmake ..
ninja install
popd popd
rm -rf Vulkan-ValidationLayers rm -rf Vulkan-ValidationLayers

2
.gitlab-ci/image-tags.yml
View File

@@ -16,7 +16,7 @@ variables:
DEBIAN_X86_TEST_ANDROID_IMAGE_PATH: "debian/x86_test-android" DEBIAN_X86_TEST_ANDROID_IMAGE_PATH: "debian/x86_test-android"
DEBIAN_X86_TEST_ANDROID_TAG: "2023-04-12-deqp-egl" 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" DEBIAN_X86_TEST_VK_TAG: "2023-04-14-dxvk-2.1-1"
ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump" ALPINE_X86_BUILD_TAG: "2023-03-20-3.17-bump"