From 5655a30412c08a4cb1760a76d68f5955095046d6 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 19 Nov 2024 21:17:14 +0100 Subject: [PATCH] ci/container: move vkd3d-proton build section into the script itself Part-of: --- .gitlab-ci/container/build-vkd3d-proton.sh | 4 ++++ .gitlab-ci/container/debian/test-vk.sh | 2 -- .gitlab-ci/container/setup-wine.sh | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/build-vkd3d-proton.sh b/.gitlab-ci/container/build-vkd3d-proton.sh index d932f35b4fc..ac259e97056 100644 --- a/.gitlab-ci/container/build-vkd3d-proton.sh +++ b/.gitlab-ci/container/build-vkd3d-proton.sh @@ -6,6 +6,8 @@ # KERNEL_ROOTFS_TAG set -ex +uncollapsed_section_start vkd3d-proton "Building vkd3d-proton" + VKD3D_PROTON_COMMIT="59d6d4b5ed23766e69fe252408a3401d2fd52ce8" VKD3D_PROTON_DST_DIR="/vkd3d-proton-tests" @@ -45,3 +47,5 @@ popd rm -rf "$VKD3D_PROTON_BUILD_DIR" rm -rf "$VKD3D_PROTON_SRC_DIR" + +section_end vkd3d-proton diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh index bdbdb0d6db3..43318c62e60 100644 --- a/.gitlab-ci/container/debian/test-vk.sh +++ b/.gitlab-ci/container/debian/test-vk.sh @@ -120,8 +120,6 @@ DEQP_TARGET=default \ ############### Build VKD3D-Proton -uncollapsed_section_switch proton "Installing Proton (Wine/D3DVK emulation)" - . .gitlab-ci/container/setup-wine.sh "/vkd3d-proton-wine64" . .gitlab-ci/container/build-vkd3d-proton.sh diff --git a/.gitlab-ci/container/setup-wine.sh b/.gitlab-ci/container/setup-wine.sh index 7e61e918c79..a943fb07b8d 100755 --- a/.gitlab-ci/container/setup-wine.sh +++ b/.gitlab-ci/container/setup-wine.sh @@ -2,6 +2,8 @@ set -u +uncollapsed_section_start wine "Setting up Wine" + export WINEPREFIX="$1" export WINEDEBUG="-all" @@ -24,3 +26,5 @@ rm crashdialog.reg # it a bit more of time for it to be created solves the problem # ... while ! test -f "${WINEPREFIX}/system.reg"; do sleep 1; done + +section_end wine