summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorKalev Lember <klember@redhat.com>2019-01-09 11:14:09 +0100
committerKalev Lember <klember@redhat.com>2019-01-09 11:28:03 +0100
commit3ee00f9e850c37ce9d50e07c1728890fad96d498 (patch)
tree457290aa3d2b3b15413c76fd0cf0a590f3dc4d3b /.travis.yml
parent59664c23f0cca8786ccef8423971a1eb5709d6d0 (diff)
downloadappstream-glib-3ee00f9e850c37ce9d50e07c1728890fad96d498.tar.gz
CI: Update Fedora from 25 to 29, and Debian from Stretch to Buster
This gets us new meson for https://github.com/hughsie/appstream-glib/pull/281, and also makes it possible to enable -Ddep11=true for Debian as it's no longer blocked by too old meson in Stretch.
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml9
1 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index be15307..0dcc31f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,10 +6,9 @@ services:
- docker
before_script:
- - docker build -t appstream-glib-fedora-25 -f contrib/ci/Dockerfile-fedora-25 .
- - docker build -t appstream-glib-debian-stretch -f contrib/ci/Dockerfile-debian-stretch .
+ - docker build -t appstream-glib-fedora-29 -f contrib/ci/Dockerfile-fedora-29 .
+ - docker build -t appstream-glib-debian-buster -f contrib/ci/Dockerfile-debian-buster .
script:
- - docker run -t -v `pwd`:/build appstream-glib-fedora-25 ./contrib/ci/build_and_test.sh -Drpm=true -Ddep11=false
- # ideally Ddep11=true but meson is too old
- - docker run -t -v `pwd`:/build appstream-glib-debian-stretch ./contrib/ci/build_and_test.sh -Drpm=false -Ddep11=false
+ - docker run -t -v `pwd`:/build appstream-glib-fedora-29 ./contrib/ci/build_and_test.sh -Drpm=true -Ddep11=false
+ - docker run -t -v `pwd`:/build appstream-glib-debian-buster ./contrib/ci/build_and_test.sh -Drpm=false -Ddep11=true