aboutsummaryrefslogtreecommitdiff
path: root/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml
diff options
context:
space:
mode:
authorDaniel Díaz <daniel.diaz@linaro.org>2017-11-22 10:17:02 -0600
committerFathi Boudra <fathi.boudra@linaro.org>2017-11-23 10:19:29 +0000
commitf492c1605219c2f821ff23f4aae89d20fc4c19c2 (patch)
treee7e6d03225846252bb1aa5650608a6738f9bc305 /linaro-hikey-stable-rc-4.4-merge-and-tag.yaml
parent6b36e99e162aa3feb0fe682f4acf662f188eab6d (diff)
linaro-hikey-stable-rc-4.4-merge-and-tag: differentiate multiple tags on same day
Some times, the same 4.4 RC branch might be updated on the very same day before it can be considered final (as final as an RC can be deemed), and the job would fail because the tag upon the merge has already been employed. This change introduces an unique suffix (BUILD_NUMBER)for the tag in case there is more than one on the same day. This is also compatible with other jobs that relying on sorting of tags using `sort -V`. Change-Id: I15c2166f62ce619a161986af05cf5e7b268262f3 Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Diffstat (limited to 'linaro-hikey-stable-rc-4.4-merge-and-tag.yaml')
-rw-r--r--linaro-hikey-stable-rc-4.4-merge-and-tag.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml b/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml
index 9c890be7e8..6c0bb29370 100644
--- a/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml
+++ b/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml
@@ -66,7 +66,7 @@
git merge --no-edit sumit-lts/lts-4.4.y-hikey
# Apply tag
- tag=${kernel_version}-hikey-$(date +"%Y%m%d")
+ tag=${kernel_version}-hikey-$(date +"%Y%m%d")-${BUILD_NUMBER}
git tag ${tag}
# Push tag