Browse Source

travis: build on Ubuntu 18.04

Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com>
bboozzoo/fix-build-and-warnings
Maciek Borzecki 5 years ago
parent
commit
4d90669457
2 changed files with 8 additions and 8 deletions
  1. +1
    -1
      .travis.yml
  2. +7
    -7
      extra/travis-build

+ 1
- 1
.travis.yml View File

@ -6,7 +6,7 @@ env:
- DISTRO=fedora - DISTRO=fedora
- DISTRO=archlinux - DISTRO=archlinux
- DISTRO=opensuse - DISTRO=opensuse
- DISTRO=ubuntu-xenial
- DISTRO=ubuntu-bionic
script: script:
- ./extra/travis-build "${DISTRO}" - ./extra/travis-build "${DISTRO}"

+ 7
- 7
extra/travis-build View File

@ -83,10 +83,10 @@ deps_archlinux() {
uncrustify uncrustify
} }
deps_ubuntu_xenial() {
deps_ubuntu() {
apt-get update && \ apt-get update && \
apt-get install -y \ apt-get install -y \
meson/xenial-backports \
meson \
pkg-config \ pkg-config \
valac \ valac \
libgirepository1.0-dev \ libgirepository1.0-dev \
@ -111,8 +111,8 @@ install_deps() {
archlinux) archlinux)
deps_archlinux deps_archlinux
;; ;;
ubuntu-xenial)
deps_ubuntu_xenial
ubuntu-bionic)
deps_ubuntu
;; ;;
*) *)
echo "unsupported distro $1" echo "unsupported distro $1"
@ -144,7 +144,7 @@ build_in_container() {
# distro specific quirks # distro specific quirks
case "$1" in case "$1" in
ubuntu-xenial|opensuse|fedora)
ubuntu-*|opensuse|fedora)
echo "$1 is using an outdated version of uncrustify, suppress formatting errors" echo "$1 is using an outdated version of uncrustify, suppress formatting errors"
export SUPPRESS_FMT=1 export SUPPRESS_FMT=1
;; ;;
@ -164,8 +164,8 @@ spin_container() {
opensuse) opensuse)
DOCKER_IMG=opensuse/tumbleweed DOCKER_IMG=opensuse/tumbleweed
;; ;;
ubuntu-xenial)
DOCKER_IMG=ubuntu:xenial
ubuntu-bionic)
DOCKER_IMG=ubuntu:bionic
;; ;;
*) *)
echo "unsupported distro $1" echo "unsupported distro $1"


Loading…
Cancel
Save