summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2019-09-11 18:35:08 +0200
committerMichel Dänzer <michel@daenzer.net>2019-09-18 10:36:48 +0000
commita01230e73ae70a7e8a1b8af673a5ffaa1e183a53 (patch)
treed84b675a660481c6c02e426c0a509c753aa49d87 /.gitlab-ci
parent8a199928696c64f5edd89b63aa2db4d9e346ad93 (diff)
downloadmesa-a01230e73ae70a7e8a1b8af673a5ffaa1e183a53.tar.gz
gitlab-ci: Use newer packages from backports by default
This is needed in particular to get a recent enough version of meson in the stretch image, but should be generally beneficial. Acked-by: Eric Engestrom <eric.engestrom@intel.com>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/debian-install.sh9
-rw-r--r--.gitlab-ci/debian-stretch-install.sh9
2 files changed, 18 insertions, 0 deletions
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index e77ae132772..5c947b0d042 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -20,6 +20,15 @@ echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources
apt-get update
+# Use newer packages from backports by default
+cat >/etc/apt/preferences <<EOF
+Package: *
+Pin: release a=buster-backports
+Pin-Priority: 500
+EOF
+
+apt-get dist-upgrade -y
+
apt-get install -y --no-remove \
llvm-6.0-dev \
libclang-6.0-dev \
diff --git a/.gitlab-ci/debian-stretch-install.sh b/.gitlab-ci/debian-stretch-install.sh
index b9cfa4000b6..906274527b9 100644
--- a/.gitlab-ci/debian-stretch-install.sh
+++ b/.gitlab-ci/debian-stretch-install.sh
@@ -14,6 +14,15 @@ echo 'deb https://deb.debian.org/debian stretch-backports main' >/etc/apt/source
apt-get update
+# Use newer packages from backports by default
+cat >/etc/apt/preferences <<EOF
+Package: *
+Pin: release a=stretch-backports
+Pin-Priority: 500
+EOF
+
+apt-get dist-upgrade -y
+
apt-get install -y --no-remove \
llvm-3.9-dev \
libclang-3.9-dev \