docker
/
ci-image-git-buildpackage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'use-pristine-tar' into 'master' 

Tell gbp to use pristine-tar if it exists

See merge request salsa-ci-team/ci-image-git-buildpackage!2
This commit is contained in:
Hans-Christoph Steiner 2019-01-21 09:58:16 +00:00
parent 720cf74574 84e2a28ad5
commit d170a2b6c2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gitlab-ci-git-buildpackage
View File

@ -26,6 +26,7 @@ else
fi
dpkg-checkbuilddeps
debversion=$(dpkg-parsechangelog -S Version)
buildpackage_options=
if [[ $debversion = *-* ]]; then
echo "ensure pristine-tar branch exists and is current"
git clean -fdx
@ -42,6 +43,7 @@ if [[ $debversion = *-* ]]; then
dpkg -i tar_1.29b-1.1_amd64.deb
rm -f tar_1.29b-1.1_amd64.deb
fi
buildpackage_options=--git-pristine-tar
else
echo "no pristine-tar branch, trying uscan";
apt_get_auto_install gnupg2 libwww-perl;
@ -53,7 +55,7 @@ fi
echo "make $CI_COMMIT_REF_NAME branch current for gbp"
git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA"
if [ -z "$CI_COMMIT_TAG" ]; then
gbp buildpackage -uc -us --git-debian-branch="$CI_COMMIT_REF_NAME"
gbp buildpackage -uc -us $buildpackage_options --git-debian-branch="$CI_COMMIT_REF_NAME"
else
gbp buildpackage -uc -us
gbp buildpackage -uc -us $buildpackage_options
fi