From 4d906694572335d1d8ab24017eef5d4e0b7e45f4 Mon Sep 17 00:00:00 2001
From: Maciek Borzecki <maciek.borzecki@gmail.com>
Date: Wed, 29 Jan 2020 22:27:36 +0100
Subject: [PATCH] travis: build on Ubuntu 18.04

Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
---
 .travis.yml        |  2 +-
 extra/travis-build | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d8a8ba3..d78fbd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ env:
     - DISTRO=fedora
     - DISTRO=archlinux
     - DISTRO=opensuse
-    - DISTRO=ubuntu-xenial
+    - DISTRO=ubuntu-bionic
 
 script:
   - ./extra/travis-build "${DISTRO}"
diff --git a/extra/travis-build b/extra/travis-build
index 3707ce7..0da87e5 100755
--- a/extra/travis-build
+++ b/extra/travis-build
@@ -83,10 +83,10 @@ deps_archlinux() {
            uncrustify
 }
 
-deps_ubuntu_xenial() {
+deps_ubuntu() {
     apt-get update && \
         apt-get install -y \
-                meson/xenial-backports \
+                meson \
                 pkg-config \
                 valac \
                 libgirepository1.0-dev \
@@ -111,8 +111,8 @@ install_deps() {
         archlinux)
             deps_archlinux
             ;;
-        ubuntu-xenial)
-            deps_ubuntu_xenial
+        ubuntu-bionic)
+            deps_ubuntu
             ;;
         *)
             echo "unsupported distro $1"
@@ -144,7 +144,7 @@ build_in_container() {
 
     # distro specific quirks
     case "$1" in
-        ubuntu-xenial|opensuse|fedora)
+        ubuntu-*|opensuse|fedora)
             echo "$1 is using an outdated version of uncrustify, suppress formatting errors"
             export SUPPRESS_FMT=1
             ;;
@@ -164,8 +164,8 @@ spin_container() {
         opensuse)
             DOCKER_IMG=opensuse/tumbleweed
             ;;
-        ubuntu-xenial)
-            DOCKER_IMG=ubuntu:xenial
+        ubuntu-bionic)
+            DOCKER_IMG=ubuntu:bionic
             ;;
         *)
             echo "unsupported distro $1"