diff --git a/contrib/ci/Dockerfile-debian-experimental b/contrib/ci/Dockerfile-debian-experimental index cc6b79143..d7eaa9841 100644 --- a/contrib/ci/Dockerfile-debian-experimental +++ b/contrib/ci/Dockerfile-debian-experimental @@ -51,6 +51,7 @@ RUN apt-get -t experimental install -yq --no-install-recommends \ libappstream-glib-dev #deps needed only for installed tests RUN apt-get install -yq --no-install-recommends \ - gnome-desktop-testing dbus-x11 ca-certificates python-gi + gnome-desktop-testing dbus-x11 ca-certificates \ + python-gi python-requests RUN mkdir /build WORKDIR /build diff --git a/contrib/ci/Dockerfile-debian-unstable b/contrib/ci/Dockerfile-debian-unstable index d7bfbaa73..5cf454f46 100644 --- a/contrib/ci/Dockerfile-debian-unstable +++ b/contrib/ci/Dockerfile-debian-unstable @@ -47,6 +47,7 @@ RUN apt-get install -yq --no-install-recommends \ valgrind #deps needed only for installed tests RUN apt-get install -yq --no-install-recommends \ - gnome-desktop-testing dbus-x11 ca-certificates python-gi + gnome-desktop-testing dbus-x11 ca-certificates \ + python-gi python-requests RUN mkdir /build WORKDIR /build diff --git a/contrib/ci/Dockerfile-fedora-25 b/contrib/ci/Dockerfile-fedora-25 index 65688568f..4e4401e9b 100644 --- a/contrib/ci/Dockerfile-fedora-25 +++ b/contrib/ci/Dockerfile-fedora-25 @@ -23,6 +23,7 @@ RUN dnf --enablerepo=updates-testing -y install \ gobject-introspection-devel \ gpgme-devel \ gtk-doc \ + jq \ libappstream-glib-devel \ libarchive-devel \ libgudev1-devel \ @@ -51,6 +52,8 @@ RUN dnf --enablerepo=updates-testing -y install \ dconf \ gnome-desktop-testing \ polkit \ + python-gobject \ + python2-requests \ gnupg2 RUN mkdir /build WORKDIR /build diff --git a/contrib/ci/build_and_install_rpms.sh b/contrib/ci/build_and_install_rpms.sh index 48c4ea558..2c6427908 100755 --- a/contrib/ci/build_and_install_rpms.sh +++ b/contrib/ci/build_and_install_rpms.sh @@ -16,9 +16,9 @@ meson .. \ -Denable-colorhug=true $@ ninja-build dist popd -VERSION=`ls | sed '/^fwupd-.*.tar.xz/!d; s,^fwupd-,,; s,.tar.xz,,'` +VERSION=`mesonintrospect build --projectinfo | jq -r .version` mkdir -p $HOME/rpmbuild/SOURCES/ -mv fwupd-$VERSION.tar.xz $HOME/rpmbuild/SOURCES/ +mv build/meson-dist/fwupd-$VERSION.tar.xz $HOME/rpmbuild/SOURCES/ #generate a spec file sed "s,#VERSION#,$VERSION,;