diff options
| author | John Rigby <john.rigby@linaro.org> | 2011-12-07 21:11:35 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-03-17 17:08:07 -0600 |
| commit | b474894728bb87d911ec57aff1cb68d75dd999b0 (patch) | |
| tree | 89b72232c2f9abbc6fe3e5d3b87963950724cc56 /debian.linaro | |
| parent | 3d6b10535d51b32cbf61c277eace6c2b1e81a66d (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>
Diffstat (limited to 'debian.linaro')
| -rwxr-xr-x | debian.linaro/scripts/mkflavourbranches | 9 |
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 |