diff options
| author | Richard Hughes <richard@hughsie.com> | 2017-06-08 08:14:05 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2017-06-08 08:14:05 +0100 |
| commit | 3e780f886c6c7376c142704408c912e1a0789166 (patch) | |
| tree | 02d4132333ef2cd814e5f2b7377ed26609b2a98e | |
| parent | e0c08dab4cf4950c48e1333ca50c801e2d97a16c (diff) | |
| download | appstream-glib-3e780f886c6c7376c142704408c912e1a0789166.tar.gz | |
f
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | contrib/ci/Dockerfile-debian-stretch (renamed from contrib/ci/Dockerfile-debian) | 0 | ||||
| -rw-r--r-- | contrib/ci/Dockerfile-fedora | 8 | ||||
| -rw-r--r-- | contrib/ci/Dockerfile-fedora-25 | 31 |
4 files changed, 35 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index e20206d..847ba30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,10 +6,10 @@ services: - docker before_script: - - docker build -t appstream-glib-fedora -f contrib/ci/Dockerfile-fedora . - - docker build -t appstream-glib-debian -f contrib/ci/Dockerfile-debian . + - 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-unstable . script: - - docker run -t -v `pwd`:/build appstream-glib-fedora ./contrib/ci/build_and_test.sh -Denable-rpm=true -Denable-dep11=false + - docker run -t -v `pwd`:/build appstream-glib-fedora-25 ./contrib/ci/build_and_test.sh -Denable-rpm=true -Denable-dep11=false # ideally Denable-dep11=true but meson is too old - - docker run -t -v `pwd`:/build appstream-glib-debian ./contrib/ci/build_and_test.sh -Denable-rpm=false -Denable-dep11=false + - docker run -t -v `pwd`:/build appstream-glib-debian-stretch ./contrib/ci/build_and_test.sh -Denable-rpm=false -Denable-dep11=false diff --git a/contrib/ci/Dockerfile-debian b/contrib/ci/Dockerfile-debian-stretch index e7e59f9..e7e59f9 100644 --- a/contrib/ci/Dockerfile-debian +++ b/contrib/ci/Dockerfile-debian-stretch diff --git a/contrib/ci/Dockerfile-fedora b/contrib/ci/Dockerfile-fedora deleted file mode 100644 index a37e3ad..0000000 --- a/contrib/ci/Dockerfile-fedora +++ /dev/null @@ -1,8 +0,0 @@ -FROM fedora:25 - -RUN dnf -y update -RUN dnf -y install dnf-plugins-core redhat-rpm-config gcab libyaml-devel meson -RUN dnf -y builddep libappstream-glib - -RUN mkdir /build -WORKDIR /build diff --git a/contrib/ci/Dockerfile-fedora-25 b/contrib/ci/Dockerfile-fedora-25 new file mode 100644 index 0000000..e42a0be --- /dev/null +++ b/contrib/ci/Dockerfile-fedora-25 @@ -0,0 +1,31 @@ +FROM fedora:25 + +RUN dnf -y update +RUN dnf -y install \ + docbook-style-xsl \ + docbook-utils \ + fontconfig-devel \ + freetype-devel \ + gcab \ + gdk-pixbuf2-devel \ + gettext \ + glib2-devel \ + gobject-introspection-devel \ + gperf \ + gtk3-devel \ + gtk-doc \ + json-glib-devel \ + libarchive-devel \ + libgcab1-devel \ + libsoup-devel \ + libstemmer-devel \ + libuuid-devel \ + libxslt \ + libyaml-devel \ + meson \ + pango-devel \ + redhat-rpm-config \ + rpm-devel \ + sqlite-devel +RUN mkdir /build +WORKDIR /build |