From a25a9565ac4bf1f091eccc4d970377a7897fbbf9 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 14 Jun 2018 16:00:41 +0200 Subject: [PATCH] move lintian runs to script called gitlab-ci-lintian --- Dockerfile | 1 + gitlab-ci-git-buildpackage | 5 +---- gitlab-ci-lintian | 11 +++++++++++ 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100755 gitlab-ci-lintian diff --git a/Dockerfile b/Dockerfile index 12da209..d30501b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,7 @@ RUN mkdir -p /usr/share/man/man1 \ COPY gitlab-ci-git-buildpackage / COPY gitlab-ci-common /usr/share/ COPY gitlab-ci-aptly /usr/bin/ +COPY gitlab-ci-lintian /usr/bin/ COPY gitlab-ci-enable-sid /usr/bin/ COPY gitlab-ci-enable-experimental /usr/bin/ diff --git a/gitlab-ci-git-buildpackage b/gitlab-ci-git-buildpackage index 4094197..0849a7e 100755 --- a/gitlab-ci-git-buildpackage +++ b/gitlab-ci-git-buildpackage @@ -51,10 +51,7 @@ if [[ ! -f $lockfile ]] ; then gbp buildpackage -uc -us fi - echo "performing general and experimental lintian checks" - su --shell /bin/sh nobody --command "lintian --color always -EviIL +pedantic ../*.changes" || true - echo "performing ftp-master-rejects lintian checks" - su --shell /bin/sh nobody --command "lintian --color always -viF ../*.changes" + gitlab-ci-lintian if [ -e debian/tests/control ]; then autopkgtest ../*.changes -- null diff --git a/gitlab-ci-lintian b/gitlab-ci-lintian new file mode 100755 index 0000000..b1ce2ca --- /dev/null +++ b/gitlab-ci-lintian @@ -0,0 +1,11 @@ +#!/bin/bash -e + +. /usr/share/gitlab-ci-common + +$apt_get update +$apt_get install lintian + +echo "performing general and experimental lintian checks" +su --shell /bin/sh nobody --command "lintian --color always -EviIL +pedantic ../*.changes" || true +echo "performing ftp-master-rejects lintian checks" +su --shell /bin/sh nobody --command "lintian --color always -viF ../*.changes"