diff options
| author | Kalev Lember <klember@redhat.com> | 2019-01-09 11:14:09 +0100 |
|---|---|---|
| committer | Kalev Lember <klember@redhat.com> | 2019-01-09 11:28:03 +0100 |
| commit | 3ee00f9e850c37ce9d50e07c1728890fad96d498 (patch) | |
| tree | 457290aa3d2b3b15413c76fd0cf0a590f3dc4d3b | |
| parent | 59664c23f0cca8786ccef8423971a1eb5709d6d0 (diff) | |
| download | appstream-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.
| -rw-r--r-- | .travis.yml | 9 | ||||
| -rw-r--r-- | contrib/ci/Dockerfile-debian-buster (renamed from contrib/ci/Dockerfile-debian-stretch) | 4 | ||||
| -rw-r--r-- | contrib/ci/Dockerfile-fedora-29 (renamed from contrib/ci/Dockerfile-fedora-25) | 2 |
3 files changed, 7 insertions, 8 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 diff --git a/contrib/ci/Dockerfile-debian-stretch b/contrib/ci/Dockerfile-debian-buster index 805edb4..a4384a3 100644 --- a/contrib/ci/Dockerfile-debian-stretch +++ b/contrib/ci/Dockerfile-debian-buster @@ -1,6 +1,6 @@ -FROM debian:stretch +FROM debian:buster -RUN echo "deb-src http://deb.debian.org/debian/ stretch main" >> /etc/apt/sources.list +RUN echo "deb-src http://deb.debian.org/debian/ buster main" >> /etc/apt/sources.list RUN apt-get update -qq RUN apt-get install -yq --no-install-recommends meson libstemmer-dev RUN apt-get build-dep -yq appstream-glib diff --git a/contrib/ci/Dockerfile-fedora-25 b/contrib/ci/Dockerfile-fedora-29 index 756abf9..97a2beb 100644 --- a/contrib/ci/Dockerfile-fedora-25 +++ b/contrib/ci/Dockerfile-fedora-29 @@ -1,4 +1,4 @@ -FROM fedora:25 +FROM fedora:29 RUN dnf -y update RUN dnf -y install \ |