trivial: Fix CI harder

This commit is contained in:
Richard Hughes 2017-06-22 13:33:14 +01:00
parent 5d9e9f4a36
commit 2877237f8a
4 changed files with 9 additions and 4 deletions

View File

@ -51,6 +51,7 @@ RUN apt-get -t experimental install -yq --no-install-recommends \
libappstream-glib-dev libappstream-glib-dev
#deps needed only for installed tests #deps needed only for installed tests
RUN apt-get install -yq --no-install-recommends \ 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 RUN mkdir /build
WORKDIR /build WORKDIR /build

View File

@ -47,6 +47,7 @@ RUN apt-get install -yq --no-install-recommends \
valgrind valgrind
#deps needed only for installed tests #deps needed only for installed tests
RUN apt-get install -yq --no-install-recommends \ 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 RUN mkdir /build
WORKDIR /build WORKDIR /build

View File

@ -23,6 +23,7 @@ RUN dnf --enablerepo=updates-testing -y install \
gobject-introspection-devel \ gobject-introspection-devel \
gpgme-devel \ gpgme-devel \
gtk-doc \ gtk-doc \
jq \
libappstream-glib-devel \ libappstream-glib-devel \
libarchive-devel \ libarchive-devel \
libgudev1-devel \ libgudev1-devel \
@ -51,6 +52,8 @@ RUN dnf --enablerepo=updates-testing -y install \
dconf \ dconf \
gnome-desktop-testing \ gnome-desktop-testing \
polkit \ polkit \
python-gobject \
python2-requests \
gnupg2 gnupg2
RUN mkdir /build RUN mkdir /build
WORKDIR /build WORKDIR /build

View File

@ -16,9 +16,9 @@ meson .. \
-Denable-colorhug=true $@ -Denable-colorhug=true $@
ninja-build dist ninja-build dist
popd 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/ 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 #generate a spec file
sed "s,#VERSION#,$VERSION,; sed "s,#VERSION#,$VERSION,;