From 9eaa1138f55be396d3a19f2e6e2175fd9307cefc Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Thu, 28 Nov 2019 18:51:13 +0000 Subject: trivial: Move the CI to Fedora 31 --- .travis.yml | 8 ++++---- contrib/ci/Dockerfile-fedora | 15 +++++++++++++++ contrib/ci/Dockerfile-fedora-26 | 15 --------------- 3 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 contrib/ci/Dockerfile-fedora delete mode 100644 contrib/ci/Dockerfile-fedora-26 diff --git a/.travis.yml b/.travis.yml index d57e8a3..36044cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,9 @@ services: - docker before_script: - - docker build -t appstream-glib-fedora-26 -f contrib/ci/Dockerfile-fedora-26 . -# - docker build -t appstream-glib-debian-stretch -f contrib/ci/Dockerfile-debian-stretch . + - docker build -t gusb-fedora -f contrib/ci/Dockerfile-fedora . +# - docker build -t gusb-debian-stretch -f contrib/ci/Dockerfile-debian-stretch . script: - - docker run -t -v `pwd`:/build appstream-glib-fedora-26 ./contrib/ci/build_and_test.sh -Dtests=false -# - docker run -t -v `pwd`:/build appstream-glib-debian-stretch ./contrib/ci/build_and_test.sh -Dtests=false + - docker run -t -v `pwd`:/build gusb-fedora ./contrib/ci/build_and_test.sh -Dtests=false +# - docker run -t -v `pwd`:/build gusb-debian-stretch ./contrib/ci/build_and_test.sh -Dtests=false diff --git a/contrib/ci/Dockerfile-fedora b/contrib/ci/Dockerfile-fedora new file mode 100644 index 0000000..90ee09a --- /dev/null +++ b/contrib/ci/Dockerfile-fedora @@ -0,0 +1,15 @@ +FROM fedora:31 + +RUN dnf -y update +RUN dnf -y install \ + glib2-devel \ + gobject-introspection-devel \ + gtk-doc \ + libusb1-devel \ + meson \ + redhat-rpm-config \ + rpm-devel \ + vala-devel \ + vala-tools +RUN mkdir /build +WORKDIR /build diff --git a/contrib/ci/Dockerfile-fedora-26 b/contrib/ci/Dockerfile-fedora-26 deleted file mode 100644 index 81b0a9c..0000000 --- a/contrib/ci/Dockerfile-fedora-26 +++ /dev/null @@ -1,15 +0,0 @@ -FROM fedora:26 - -RUN dnf -y update -RUN dnf -y install \ - glib2-devel \ - gobject-introspection-devel \ - gtk-doc \ - libusb1-devel \ - meson \ - redhat-rpm-config \ - rpm-devel \ - vala-devel \ - vala-tools -RUN mkdir /build -WORKDIR /build -- cgit v1.2.1