From 8aecf2f9c0cca1508ec0c2ea8219020dac67f9fb Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 6 Jan 2020 11:06:36 +0000 Subject: Update the Fedora CI to F31 --- .travis.yml | 4 ++-- contrib/ci/Dockerfile-fedora | 28 ++++++++++++++++++++++++++++ contrib/ci/Dockerfile-fedora-29 | 28 ---------------------------- 3 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 contrib/ci/Dockerfile-fedora delete mode 100644 contrib/ci/Dockerfile-fedora-29 diff --git a/.travis.yml b/.travis.yml index 0dcc31f..d1d15ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ services: - docker before_script: - - docker build -t appstream-glib-fedora-29 -f contrib/ci/Dockerfile-fedora-29 . + - docker build -t appstream-glib-fedora -f contrib/ci/Dockerfile-fedora . - docker build -t appstream-glib-debian-buster -f contrib/ci/Dockerfile-debian-buster . script: - - 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-fedora ./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-fedora b/contrib/ci/Dockerfile-fedora new file mode 100644 index 0000000..ba97da5 --- /dev/null +++ b/contrib/ci/Dockerfile-fedora @@ -0,0 +1,28 @@ +FROM fedora:31 + +RUN dnf -y update +RUN dnf -y install \ + docbook-style-xsl \ + docbook-utils \ + fontconfig-devel \ + freetype-devel \ + gdk-pixbuf2-devel \ + gettext \ + glib2-devel \ + gobject-introspection-devel \ + gperf \ + gtk3-devel \ + gtk-doc \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libstemmer-devel \ + libuuid-devel \ + libxslt \ + libyaml-devel \ + meson \ + pango-devel \ + redhat-rpm-config \ + rpm-devel +RUN mkdir /build +WORKDIR /build diff --git a/contrib/ci/Dockerfile-fedora-29 b/contrib/ci/Dockerfile-fedora-29 deleted file mode 100644 index ec0b3fd..0000000 --- a/contrib/ci/Dockerfile-fedora-29 +++ /dev/null @@ -1,28 +0,0 @@ -FROM fedora:29 - -RUN dnf -y update -RUN dnf -y install \ - docbook-style-xsl \ - docbook-utils \ - fontconfig-devel \ - freetype-devel \ - gdk-pixbuf2-devel \ - gettext \ - glib2-devel \ - gobject-introspection-devel \ - gperf \ - gtk3-devel \ - gtk-doc \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libstemmer-devel \ - libuuid-devel \ - libxslt \ - libyaml-devel \ - meson \ - pango-devel \ - redhat-rpm-config \ - rpm-devel -RUN mkdir /build -WORKDIR /build -- cgit v1.2.1