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>

diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index e77ae132772ab572aeeca7ce382d7793da4f7f94..5c947b0d042776d0653baf5a29e4a43ea984c180 100644 (file)
--- 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 b9cfa4000b6345a9b22ac7f3568ed4a34e71e7c1..906274527b921aee033b3cfded40b007c8f49b64 100644 (file)
--- 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 \