Module: Mesa Branch: main Commit: 1d8cf2ecdd62c6a375b7e3d80e8e03e1e3e277bc URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1d8cf2ecdd62c6a375b7e3d80e8e03e1e3e277bc
Author: David Heidelberg <[email protected]> Date: Thu Aug 4 15:45:30 2022 +0200 ci: move DXVK instalation outside of x86_test-vk It will be used by LAVA jobs. Reviewed-by: "Sergi Blanch Torne" <[email protected]> Signed-off-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17887> --- .gitlab-ci/container/debian/x86_test-vk.sh | 34 +---------------------------- .gitlab-ci/container/install-wine-dxvk.sh | 35 ++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh index a58e5b2409f..4fc35c62eb2 100644 --- a/.gitlab-ci/container/debian/x86_test-vk.sh +++ b/.gitlab-ci/container/debian/x86_test-vk.sh @@ -101,40 +101,8 @@ EOF ############### Install DXVK -dxvk_install_release() { - local DXVK_VERSION=${1:-"1.10.1"} - - wget "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz"; - tar xzpf dxvk-"${DXVK_VERSION}".tar.gz - "dxvk-${DXVK_VERSION}"/setup_dxvk.sh install - rm -rf "dxvk-${DXVK_VERSION}" - rm dxvk-"${DXVK_VERSION}".tar.gz -} - -# Install from a Github PR number -dxvk_install_pr() { - local __prnum=$1 - - # NOTE: Clone all the ensite history of the repo so as not to think - # harder about cloning just enough for 'git describe' to work. 'git - # 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 - git fetch origin pull/"$__prnum"/head:pr - git checkout pr - ./package-release.sh pr ../dxvk-build --no-package - popd - pushd ./dxvk-build/dxvk-pr - ./setup_dxvk.sh install - popd - rm -rf ./dxvk-build ./dxvk -} - -# Sets up the WINEPREFIX for the DXVK installation commands below. setup_wine "/dxvk-wine64" -dxvk_install_release "1.10.1" -#dxvk_install_pr 2359 +. .gitlab-ci/container/install-wine-dxvk.sh ############### Install apitrace binaries for wine diff --git a/.gitlab-ci/container/install-wine-dxvk.sh b/.gitlab-ci/container/install-wine-dxvk.sh new file mode 100755 index 00000000000..1995c3b684e --- /dev/null +++ b/.gitlab-ci/container/install-wine-dxvk.sh @@ -0,0 +1,35 @@ +#!/bin/bash + +dxvk_install_release() { + local DXVK_VERSION=${1:-"1.10.1"} + + wget "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VERSION}/dxvk-${DXVK_VERSION}.tar.gz"; + tar xzpf dxvk-"${DXVK_VERSION}".tar.gz + "dxvk-${DXVK_VERSION}"/setup_dxvk.sh install + rm -rf "dxvk-${DXVK_VERSION}" + rm dxvk-"${DXVK_VERSION}".tar.gz +} + +# Install from a Github PR number +dxvk_install_pr() { + local __prnum=$1 + + # NOTE: Clone all the ensite history of the repo so as not to think + # harder about cloning just enough for 'git describe' to work. 'git + # 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 + git fetch origin pull/"$__prnum"/head:pr + git checkout pr + ./package-release.sh pr ../dxvk-build --no-package + popd + pushd ./dxvk-build/dxvk-pr + ./setup_dxvk.sh install + popd + rm -rf ./dxvk-build ./dxvk +} + +dxvk_install_release "1.10.1" +#dxvk_install_pr 2359 +
