aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-12-07 21:11:35 -0700
committerLinaro CI <john.rigby@linaro.org>2012-02-07 22:53:31 +0000
commitebf8d3d83aa90d6d4bdef829426bf2ea986b3910 (patch)
treea718562719f4bd7e5d3bc4a0ad27f0f8a3d5b954
parent7d1ffc6cafafdc2215e84dad70d21cbae48520e8 (diff)
LINARO: mkflavourbranches: improvements for kernel ci
make signing tags optional replace ~'s in tags with -'s Signed-off-by: John Rigby <john.rigby@linaro.org>
-rwxr-xr-xdebian.linaro/scripts/mkflavourbranches9
1 files changed, 7 insertions, 2 deletions
diff --git a/debian.linaro/scripts/mkflavourbranches b/debian.linaro/scripts/mkflavourbranches
index 9df01ddae8f..40e20914440 100755
--- a/debian.linaro/scripts/mkflavourbranches
+++ b/debian.linaro/scripts/mkflavourbranches
@@ -7,6 +7,9 @@ source_pkg_name=$(dpkg-parsechangelog -l${DEBIAN}/changelog|grep Source|sed 's/^
source_pkg_version=$(dpkg-parsechangelog -l${DEBIAN}/changelog|grep Version|sed 's/^.*Version: //')
common_flavour_prefix=linaro
+git_tag_cmd="git tag -s"
+test -n "$NO_TAG_SIGN" && git_tag_cmd="git tag "
+
function fail {
echo $1
@@ -84,7 +87,8 @@ END
fi
git commit -s -m "LINARO: Linaro-${source_pkg_version} $flavour only"
tagname="Linaro-${source_pkg_version}-${flavour}-only"
- git tag -f -s -m "$tagname" $tagname HEAD
+ tagname=$(echo $tagname | sed 's/~/-/g')
+ $git_tag_cmd -f -m "$tagname" $tagname HEAD
git push $remote_push -f HEAD:$flavour-only
git push $remote_push -f $tagname
@@ -112,7 +116,8 @@ setup_working_branch $working_branch
git push $remote_push -f $working_branch:master
tagname="Linaro-${source_pkg_version}"
-git tag -f -s -m "$tagname" $tagname HEAD
+tagname=$(echo $tagname | sed 's/~/-/g')
+$git_tag_cmd -f -m "$tagname" $tagname HEAD
git push $remote_push -f $tagname
do_flavour_branches