From cbb63b4343e27602a16cb9350de7e52b8cb3166b Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 18 May 2018 15:29:12 +0200 Subject: [PATCH] support building merge request branches CI_COMMIT_TAG is only present when building a tag, in which case the var CI_COMMIT_REF_NAME is set to the tag name rather than the branch name. gbp does not build from tags, only branches. --- gitlab-ci-git-buildpackage | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gitlab-ci-git-buildpackage b/gitlab-ci-git-buildpackage index d881265..c30fe06 100755 --- a/gitlab-ci-git-buildpackage +++ b/gitlab-ci-git-buildpackage @@ -1,5 +1,10 @@ #!/bin/bash +if [ "$CI_COMMIT_REF_NAME" == "upstream" ] || [ "$CI_COMMIT_REF_NAME" == "pristine-tar" ]; then + echo No builds run on the $CI_COMMIT_REF_NAME branch, exiting + exit 0 +fi + set -e set -x @@ -18,6 +23,10 @@ git remote -v git branch --track pristine-tar origin/pristine-tar || true echo "make master branch current for gbp" git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA" -gbp buildpackage -us -uc +if [ -z "$CI_COMMIT_TAG" ]; then + gbp buildpackage -uc -us --git-debian-branch="$CI_COMMIT_REF_NAME" +else + gbp buildpackage -uc -us +fi exec "$@"