From 8b1abb264393df2efe03a2f7c44b7add37c254e0 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 29 Jan 2025 12:28:36 +0000 Subject: [PATCH] ci: Trim down VVL external builds We're not building the VVL tests, so we don't need to download and build a ton of stuff which is only needed for building tests. Signed-off-by: Daniel Stone Reviewed-by: Eric Engestrom Part-of: --- .gitlab-ci/container/build-vulkan-validation.sh | 4 +++- .gitlab-ci/image-tags.yml | 10 +++++----- 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 35c3bd30d0c..99fc31997e2 100644 --- a/.gitlab-ci/container/build-vulkan-validation.sh +++ b/.gitlab-ci/container/build-vulkan-validation.sh @@ -13,7 +13,9 @@ VALIDATION_TAG="snapshot-2024wk39" git clone -b "$VALIDATION_TAG" --single-branch --depth 1 https://github.com/KhronosGroup/Vulkan-ValidationLayers.git pushd Vulkan-ValidationLayers -python3 scripts/update_deps.py --dir external --config release --generator Ninja +# we don't need to build SPIRV-Tools tools +sed -i scripts/known_good.json -e 's/SPIRV_SKIP_EXECUTABLES=OFF/SPIRV_SKIP_EXECUTABLES=ON/' +python3 scripts/update_deps.py --dir external --config release --generator Ninja --optional tests 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 cmake --install build --strip diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 17fe46253d2..d370f758106 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -13,7 +13,7 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "20250130-ctless" + DEBIAN_BASE_TAG: "20250130-vvless" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "20250128-llvm19-up" @@ -27,10 +27,10 @@ variables: DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_TEST_ANDROID_TAG: "20250130-ctless" - DEBIAN_TEST_GL_TAG: "20250130-ctless" - DEBIAN_TEST_VK_TAG: "20250130-ctless" - KERNEL_ROOTFS_TAG: "20250130-ctless" + DEBIAN_TEST_ANDROID_TAG: "20250130-vvless" + DEBIAN_TEST_GL_TAG: "20250130-vvless" + DEBIAN_TEST_VK_TAG: "20250130-vvless" + KERNEL_ROOTFS_TAG: "20250130-vvless" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_TAG: "20250129-lavacli"