diff options
| author | David Heidelberg <david.heidelberg@collabora.com> | 2022-09-29 16:12:41 +0200 |
|---|---|---|
| committer | David Heidelberg <david.heidelberg@collabora.com> | 2022-10-08 16:36:36 -0500 |
| commit | 0c6c30d2117fae940adfbeac203405932c929c21 (patch) | |
| tree | 2c06bd6b9d5323ee29112d42622a127cc34d67d1 /.gitlab-ci | |
| parent | 27aa1720120e96bdf1d69aee1b9e2c4338bbaa0c (diff) | |
| download | mesa-0c6c30d2117fae940adfbeac203405932c929c21.tar.gz mesa-0c6c30d2117fae940adfbeac203405932c929c21.tar.bz2 mesa-0c6c30d2117fae940adfbeac203405932c929c21.zip | |
ci: uprev DXVK to 1.10.3
Acked-by: Martin Roukala <martin.roukala@mupuf.org>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18888>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/container/install-wine-dxvk.sh | 12 | ||||
| -rw-r--r-- | .gitlab-ci/image-tags.yml | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/.gitlab-ci/container/install-wine-dxvk.sh b/.gitlab-ci/container/install-wine-dxvk.sh index 442ecf448d0..b39a42c0d1d 100755 --- a/.gitlab-ci/container/install-wine-dxvk.sh +++ b/.gitlab-ci/container/install-wine-dxvk.sh @@ -1,7 +1,9 @@ #!/bin/bash +set -e + dxvk_install_release() { - local DXVK_VERSION=${1:-"1.10.1"} + local DXVK_VERSION=${1:-"1.10.3"} wget "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz" tar xzpf dxvk-"${DXVK_VERSION}".tar.gz @@ -21,14 +23,14 @@ dxvk_install_pr() { # describe' is used by the dxvk build system to generate a # dxvk_version Meson variable, which is nice-to-have. git clone https://github.com/doitsujin/dxvk - pushd dxvk || exit 1 + pushd dxvk git fetch origin pull/"$__prnum"/head:pr git checkout pr ./package-release.sh pr ../dxvk-build --no-package - popd || exit 1 - pushd ./dxvk-build/dxvk-pr || exit 1 + popd + pushd ./dxvk-build/dxvk-pr ./setup_dxvk.sh install - popd || exit 1 + popd rm -rf ./dxvk-build ./dxvk } diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index fa75a32f3fb..3da06118d7c 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -11,11 +11,11 @@ variables: DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base" DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl" - DEBIAN_X86_TEST_GL_TAG: "2022-09-26-clc" - DEBIAN_X86_TEST_VK_TAG: "2022-09-27-clc" + DEBIAN_X86_TEST_GL_TAG: "2022-09-29-uprev-dxvk" + DEBIAN_X86_TEST_VK_TAG: "2022-09-29-uprev-dxvk" FEDORA_X86_BUILD_TAG: "2022-09-22-python3-ply-2" - KERNEL_ROOTFS_TAG: "2022-10-04-gc7000" + KERNEL_ROOTFS_TAG: "2022-10-05-uprev-dxvk" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-08-17-bump" |