mark packages installed here as 'auto' so they can be easily removed
This makes for clean autopkgtest runs.
This commit is contained in:
parent
7a51128ce7
commit
d0a33ae7f5
11
Dockerfile
11
Dockerfile
|
|
@ -13,17 +13,20 @@ RUN mkdir -p /usr/share/man/man1 \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get -qy upgrade \
|
&& apt-get -qy upgrade \
|
||||||
&& apt-get -qy dist-upgrade \
|
&& apt-get -qy dist-upgrade \
|
||||||
&& apt-get -qy install --no-install-recommends \
|
&& export build_deps=' \
|
||||||
autodep8 \
|
|
||||||
autopkgtest \
|
|
||||||
build-essential \
|
build-essential \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
fakeroot \
|
fakeroot \
|
||||||
git-buildpackage \
|
git-buildpackage \
|
||||||
lintian \
|
lintian \
|
||||||
pristine-tar \
|
pristine-tar' \
|
||||||
|
&& apt-get -qy install --no-install-recommends $build_deps \
|
||||||
|
autodep8 \
|
||||||
|
autopkgtest \
|
||||||
|
git \
|
||||||
&& apt-get -qy autoremove --purge \
|
&& apt-get -qy autoremove --purge \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
|
&& apt-mark auto $build_deps \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY gitlab-ci-common /usr/share/
|
COPY gitlab-ci-common /usr/share/
|
||||||
|
|
|
||||||
|
|
@ -14,14 +14,13 @@ $apt_get update
|
||||||
|
|
||||||
cd $CI_PROJECT_DIR
|
cd $CI_PROJECT_DIR
|
||||||
if dpkg --compare-versions `dpkg -s apt |sed -n 's,^Version: \(.*\),\1,p'` ge 1.1; then
|
if dpkg --compare-versions `dpkg -s apt |sed -n 's,^Version: \(.*\),\1,p'` ge 1.1; then
|
||||||
$apt_get build-dep $CI_PROJECT_DIR
|
$apt_get -o APT::Get::Build-Dep-Automatic=yes build-dep $CI_PROJECT_DIR
|
||||||
else
|
else
|
||||||
# this is running on an older version, like jessie-backports
|
# this is running on an older version, like jessie-backports
|
||||||
export BUILD_DEPENDS=`sed 's/\s*|[^,]*,/,/g' debian/control | perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p'`
|
export BUILD_DEPENDS=`sed 's/\s*|[^,]*,/,/g' debian/control | perl -ne 'next if /^#/; $p=(s/^Build-Depends:\s*/ / or (/^ / and $p)); s/,|\n|\([^)]+\)//mg; print if $p'`
|
||||||
$apt_get install --no-install-recommends \
|
$apt_get install --no-install-recommends \
|
||||||
build-essential fakeroot git-buildpackage pristine-tar $BUILD_DEPENDS
|
build-essential fakeroot git-buildpackage pristine-tar $BUILD_DEPENDS
|
||||||
fi
|
fi
|
||||||
$apt_get autoremove --purge
|
|
||||||
dpkg-checkbuilddeps
|
dpkg-checkbuilddeps
|
||||||
echo "ensure pristine-tar branch exists and is current"
|
echo "ensure pristine-tar branch exists and is current"
|
||||||
git clean -fdx
|
git clean -fdx
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,8 @@ cp ../*.deb $CI_PROJECT_DIR/
|
||||||
|
|
||||||
gitlab-ci-lintian
|
gitlab-ci-lintian
|
||||||
|
|
||||||
|
$apt_get autoremove --purge
|
||||||
|
|
||||||
if [ -e $CI_PROJECT_DIR/debian/tests/control ]; then
|
if [ -e $CI_PROJECT_DIR/debian/tests/control ]; then
|
||||||
gitlab-ci-autopkgtest
|
gitlab-ci-autopkgtest
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue