CI: Stop building on Ubuntu 14.04 'trusty'

The version of gcc in trusty is too old for AddressSanitizer, which we
want to be able to start using, and Travis-CI finally supports Ubuntu
16.04 'xenial' now. This lets us remove some workarounds, but we need
to update others.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be115f73b96d77852e123b5a39992690127844e9..057eef4d10c678d28aa4b4783ec87d3485f13eab 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -135,15 +135,4 @@ build:xenial:
     ci_suite: "xenial"
   script: *script
 
-build:trusty:
-  when: manual
-  stage: build
-  image: "ubuntu:trusty"
-  variables:
-    ci_distro: "ubuntu"
-    ci_suite: "trusty"
-  script:
-    - chown -R user .
-    - sudo -u user -H ./tools/ci-build.sh
-
 # vim:set sw=2 sts=2 et:

diff --git a/.travis.yml b/.travis.yml
index e719efbd4e77dbfaffd15dc080ed5bdf0774ebb8..a6c18802879165837844f965c34ce8fc954105c0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@
 # SOFTWARE.
 
 sudo: required
-dist: trusty
+dist: xenial
 language: c
 script:
   - ./tools/ci-install.sh
@@ -39,7 +39,6 @@ env:
   - ci_host=i686-w64-mingw32 ci_buildsys=cmake ci_variant=debug
   - ci_host=x86_64-w64-mingw32 ci_variant=debug
   - ci_host=x86_64-w64-mingw32 ci_buildsys=cmake
-  - ci_docker=ubuntu:xenial ci_distro=ubuntu ci_suite=xenial
   - ci_docker=debian:jessie-slim ci_distro=debian ci_suite=jessie
   - ci_docker=debian:stretch-slim ci_distro=debian ci_suite=stretch
 

diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index b50e534e9dda8adffb28f0c816a1f6a95aedbaed..51e009f08dfd408fd87ce8bd6433f365df27ebc4 100755 (executable)
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -52,7 +52,7 @@ NULL=
 # OS suite (release, branch) in which we are testing.
 # Typical values for ci_distro=debian: sid, jessie
 # Typical values for ci_distro=fedora might be 25, rawhide
-: "${ci_suite:=trusty}"
+: "${ci_suite:=xenial}"
 
 if [ $(id -u) = 0 ]; then
     sudo=
@@ -79,12 +79,9 @@ case "$ci_distro" in
         $sudo sed -i -e 's/httpredir\.debian\.org/deb.debian.org/g' \
             /etc/apt/sources.list
 
-        # travis-ci has a sources list for Chrome which doesn't support i386
-        : | $sudo tee /etc/apt/sources.list.d/google-chrome.list
-
         case "$ci_suite" in
-            (trusty)
-                # Ubuntu 14.04 didn't have the wine32, wine64 packages
+            (xenial)
+                # Ubuntu 16.04 didn't have the wine32, wine64 packages
                 wine32=wine:i386
                 wine64=wine:amd64
                 ;;
@@ -142,6 +139,7 @@ case "$ci_distro" in
             libexpat-dev \
             libglib2.0-dev \
             libselinux1-dev \
+            libsystemd-dev \
             libx11-dev \
             python \
             python-dbus \
@@ -154,15 +152,6 @@ case "$ci_distro" in
             xvfb \
             ${NULL}
 
-        case "$ci_suite" in
-            (trusty)
-                $sudo apt-get -qq -y install libsystemd-daemon-dev
-                ;;
-            (*)
-                $sudo apt-get -qq -y install libsystemd-dev
-                ;;
-        esac
-
         if [ "$ci_in_docker" = yes ]; then
             # Add the user that we will use to do the build inside the
             # Docker container, and let them use sudo
@@ -173,8 +162,9 @@ case "$ci_distro" in
         fi
 
         case "$ci_suite" in
-            (trusty|jessie)
-                # Ubuntu 14.04's autoconf-archive is too old
+            (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