CI: Remove EOL versions of Debian and Ubuntu

Debian 9 'stretch' is EOL, and Ubuntu 16.04 is EOL unless you enter into
a special subscription with Canonical. This puts them outside our
informal security-support policy, and realistically, anyone sufficiently
change-averse to be following these distributions is not going to be
backporting a current version of dbus.

Signed-off-by: Simon McVittie <smcv@collabora.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 294438b0c18d54d400f09c2906d3a38684df4223..ea8a9d12afe4e9425a8b61cfe4e98981d519a430 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -142,21 +142,6 @@ x86_64-w64-mingw32-cmake-debug:
     ci_host: "x86_64-w64-mingw32"
     ci_variant: "debug"
 
-stretch:
-  extends: .debian-build
-  when: manual
-  image: "debian:stretch-slim"
-  variables:
-    ci_suite: "stretch"
-
-xenial:
-  extends: .debian-build
-  when: manual
-  image: "ubuntu:xenial"
-  variables:
-    ci_distro: "ubuntu"
-    ci_suite: "xenial"
-
 .win-build:
   image: $WINDOWS_IMAGE
   when: manual

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index 8348349c1066428e97e1ca8c9cf479dbe6fa26e3..5f2304064de566842eee480b249ce0fb93d3bc58 100755 (executable)
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -327,18 +327,9 @@ case "$ci_buildsys" in
         ${make} install DESTDIR=$(pwd)/DESTDIR
         ( cd DESTDIR && find . -ls )
 
-        case "$ci_suite" in
-            (jessie|xenial|stretch)
-                # these are too old for maintainer-upload-docs
-                ;;
-
-            (*)
-                # assume Ubuntu 18.04 'bionic', Debian 10 'buster' or newer
-                ${make} -C doc dbus-docs.tar.xz
-                tar -C $(pwd)/DESTDIR -xf doc/dbus-docs.tar.xz
-                ( cd DESTDIR/dbus-docs && find . -ls )
-                ;;
-        esac
+        ${make} -C doc dbus-docs.tar.xz
+        tar -C $(pwd)/DESTDIR -xf doc/dbus-docs.tar.xz
+        ( cd DESTDIR/dbus-docs && find . -ls )
 
         if [ "$ci_sudo" = yes ] && [ "$ci_test" = yes ]; then
             sudo ${make} install

diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index 5b3b1b2fff6ce57a3f4d978a3a4254f80b3e0e50..239b68ce78ccc35b9f6dd7e2b67462ddf594c808 100755 (executable)
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -54,9 +54,9 @@ NULL=
 
 # ci_suite:
 # OS suite (release, branch) in which we are testing.
-# Typical values for ci_distro=debian: sid, jessie
+# Typical values for ci_distro=debian: sid, bullseye
 # Typical values for ci_distro=fedora might be 25, rawhide
-: "${ci_suite:=xenial}"
+: "${ci_suite:=bullseye}"
 
 # ci_variant:
 # One of debug, reduced, legacy, production
@@ -89,18 +89,6 @@ case "$ci_distro" in
         $sudo sed -i -e 's/httpredir\.debian\.org/deb.debian.org/g' \
             /etc/apt/sources.list
 
-        case "$ci_suite" in
-            (xenial)
-                # Ubuntu 16.04 didn't have the wine32, wine64 packages
-                wine32=wine:i386
-                wine64=wine:amd64
-                ;;
-            (*)
-                wine32=wine32
-                wine64=wine64
-                ;;
-        esac
-
         case "$ci_host" in
             (i686-w64-mingw32)
                 $sudo dpkg --add-architecture i386
@@ -119,7 +107,7 @@ case "$ci_distro" in
                     "${packages[@]}"
                     binutils-mingw-w64-i686
                     g++-mingw-w64-i686
-                    $wine32 wine
+                    wine32 wine
                 )
                 ;;
             (x86_64-w64-mingw32)
@@ -127,7 +115,7 @@ case "$ci_distro" in
                     "${packages[@]}"
                     binutils-mingw-w64-x86-64
                     g++-mingw-w64-x86-64
-                    $wine64 wine
+                    wine64 wine
                 )
                 ;;
         esac
@@ -155,6 +143,7 @@ case "$ci_distro" in
             docbook-xsl
             doxygen
             dpkg-dev
+            ducktype
             g++
             gcc
             gnome-desktop-testing
@@ -173,23 +162,10 @@ case "$ci_distro" in
             xmlto
             xsltproc
             xvfb
+            yelp-tools
             zstd
         )
 
-        case "$ci_suite" in
-            (stretch)
-                # Debian 9 'stretch' didn't have the ducktype package
-                ;;
-
-            (*)
-                # assume Ubuntu 18.04 'bionic', Debian 10 'buster' or newer
-                packages=(
-                    "${packages[@]}"
-                    ducktype yelp-tools
-                )
-                ;;
-        esac
-
         $sudo apt-get -qq -y --no-install-recommends install "${packages[@]}"
 
         if [ "$ci_in_docker" = yes ]; then
@@ -200,17 +176,6 @@ case "$ci_distro" in
             chmod 0440 /etc/sudoers.d/nopasswd
         fi
 
-        # manual package setup
-        case "$ci_suite" in
-            (jessie|xenial)
-                # autoconf-archive in Debian 8 and Ubuntu 16.04 is too old,
-                # use the one from Debian 9 instead
-                wget http://deb.debian.org/debian/pool/main/a/autoconf-archive/autoconf-archive_20160916-1_all.deb
-                $sudo dpkg -i autoconf-archive_*_all.deb
-                rm autoconf-archive_*_all.deb
-                ;;
-        esac
-
         # Make sure we have a messagebus user, even if the dbus package
         # isn't installed
         $sudo adduser --system --quiet --home /nonexistent --no-create-home \