diff --git a/contrib/ci/Dockerfile-debian-experimental b/contrib/ci/Dockerfile-debian-experimental index 4e409969d..71ff4f431 100644 --- a/contrib/ci/Dockerfile-debian-experimental +++ b/contrib/ci/Dockerfile-debian-experimental @@ -9,6 +9,7 @@ RUN apt-get install -yq --no-install-recommends \ fontconfig-config \ fonts-dejavu \ gir1.2-pango-1.0 \ + git \ gcab \ gettext \ gobject-introspection \ diff --git a/contrib/ci/Dockerfile-debian-unstable b/contrib/ci/Dockerfile-debian-unstable index 1e2c83252..4af99d040 100644 --- a/contrib/ci/Dockerfile-debian-unstable +++ b/contrib/ci/Dockerfile-debian-unstable @@ -8,6 +8,7 @@ RUN apt-get install -yq --no-install-recommends \ fontconfig \ fontconfig-config \ fonts-dejavu \ + git \ gcab \ gettext \ gir1.2-appstreamglib-1.0 \ diff --git a/contrib/ci/build_and_install_debs.sh b/contrib/ci/build_and_install_debs.sh index 4242ea358..6a50ca8e5 100755 --- a/contrib/ci/build_and_install_debs.sh +++ b/contrib/ci/build_and_install_debs.sh @@ -1,7 +1,9 @@ #!/bin/bash -e #build deb packages -VERSION=`head meson.build | sed "/version :/!d; /meson/d; s/,//; s/'//g;" | awk -F ':' '{print $2}'` +VERSION=`git describe | sed 's/-/+r/;s/-/+/'` +[ -z $VERSION ] && VERSION=`head meson.build | grep ' version :' | cut -d \' -f2` + rm -rf build/ mkdir -p build && pushd build ln -s ../* .