get debian travis builds working too

For now they'll need to build with debian experimental until
appstream-glib 0.6.13 flows up to unstable (probably after
stretch releases)
This commit is contained in:
Mario Limonciello 2017-06-08 09:08:10 -05:00
parent 3d2fc1e353
commit 825e881864
3 changed files with 44 additions and 5 deletions

View File

@ -7,9 +7,8 @@ services:
before_script:
- docker build -t fwupd-fedora-25 -f contrib/ci/Dockerfile-fedora-25 .
# currently failing with "Unknown instruction: LIBFWUP-DEV"
# - docker build -t fwupd-debian-unstable -f contrib/ci/Dockerfile-debian-unstable .
- docker build -t fwupd-debian-experimental -f contrib/ci/Dockerfile-debian-experimental .
script:
- docker run -t -v `pwd`:/build fwupd-fedora-25 ./contrib/ci/build_and_test.sh
# - docker run -t -v `pwd`:/build fwupd-debian-unstable ./contrib/ci/build_and_test.sh
- docker run -t -v `pwd`:/build fwupd-debian-experimental ./contrib/ci/build_and_test.sh

View File

@ -0,0 +1,40 @@
FROM debian:experimental
RUN echo "deb-src http://deb.debian.org/debian/ unstable main" >> /etc/apt/sources.list
RUN echo "deb-src http://deb.debian.org/debian/ experimental main" >> /etc/apt/sources.list
RUN apt-get update -qq
RUN apt-get install -yq --no-install-recommends \
docbook-utils \
gcab \
gettext \
gobject-introspection \
gtk-doc-tools \
libarchive-dev \
libcolord-dev \
libcolorhug-dev \
libefivar-dev \
libelf-dev \
libfwup-dev \
libgcab-dev \
libgirepository1.0-dev \
libglib2.0-dev \
libgpgme11-dev \
libgudev-1.0-dev \
libgusb-dev \
libpolkit-gobject-1-dev \
libsmbios-dev \
libsoup2.4-dev \
libsqlite3-dev \
libtool-bin \
meson \
pkg-config \
policykit-1 \
udev \
systemd
#deps not yet in unstable:
# - new appstream-glib is fwupd dependency
RUN apt-get -t experimental install -yq --no-install-recommends \
gir1.2-appstreamglib-1.0 \
libappstream-glib-dev
RUN mkdir /build
WORKDIR /build

View File

@ -3,7 +3,6 @@ FROM debian:unstable
RUN echo "deb-src http://deb.debian.org/debian/ unstable main" >> /etc/apt/sources.list
RUN apt-get update -qq
RUN apt-get install -yq --no-install-recommends \
debhelper \
docbook-utils \
gcab \
gettext \
@ -15,7 +14,7 @@ RUN apt-get install -yq --no-install-recommends \
libcolord-dev \
libcolorhug-dev \
libefivar-dev \
libelf-dev
libelf-dev \
libfwup-dev \
libgcab-dev \
libgirepository1.0-dev \
@ -31,6 +30,7 @@ RUN apt-get install -yq --no-install-recommends \
meson \
pkg-config \
policykit-1 \
udev \
systemd
RUN mkdir /build
WORKDIR /build