diff options
| author | Michel Dänzer <[email protected]> | 2020-04-27 12:42:58 +0200 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-05-14 12:54:09 +0000 |
| commit | da3aee926387cb9113b79c5376a6a8f4295582ac (patch) | |
| tree | 177469c6d614cd246cf49ed4c0c120e13342d6b0 /.gitlab-ci/container/x86_test-vk.sh | |
| parent | fd9b445145851dcc3d697f3df46f86f86db466c0 (diff) | |
gitlab-ci: Install WINE from Debian testing
Instead of a third-party repository which has proved unreliable at
times.
This pulls in glibc 2.30 from testing in the x86_build image, so we need
to update the x86_test-{gl,vk} images to match.
Acked-by: Andres Gomez <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4851>
Diffstat (limited to '.gitlab-ci/container/x86_test-vk.sh')
| -rw-r--r-- | .gitlab-ci/container/x86_test-vk.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index c88199b42bf..455506d2972 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -14,10 +14,17 @@ apt-key add .gitlab-ci/container/llvm-snapshot.gpg.key echo "deb https://apt.llvm.org/buster/ llvm-toolchain-buster-9 main" >/etc/apt/sources.list.d/llvm9.list sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list -echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list +echo 'deb https://deb.debian.org/debian testing main' >/etc/apt/sources.list.d/testing.list apt-get update +# Don't use newer packages from testing by default +cat >/etc/apt/preferences <<EOF +Package: * +Pin: release a=testing +Pin-Priority: 100 +EOF + apt-get dist-upgrade -y apt-get install -y --no-remove \ @@ -74,6 +81,11 @@ apt-get install -y --no-remove \ wine32 \ wine64 +# Install packages we need from Debian testing last, to avoid pulling in more +apt-get install -y -t testing \ + libc6-dev + + ############### Set up Wine env variables export WINEDEBUG="-all" |