From 0c2a45a68462cd38df901d212853c91644526fde Mon Sep 17 00:00:00 2001
From: Benoit Lavenier <benoit.lavenier@e-is.pro>
Date: Fri, 27 Dec 2019 20:53:14 +0100
Subject: [PATCH] [fix] Fix tag and push tag
---
scripts/release.sh | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/scripts/release.sh b/scripts/release.sh
index 0ad55a26..32e8a6ec 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -108,6 +108,12 @@ echo "----------------------------------"
echo "- Executing git push, with tag: v$2"
echo "----------------------------------"
+
+description="$4"
+if [[ "_$description" == "_" ]]; then
+ description="Release v$2"
+fi
+
# Commit
cd ${PROJECT_DIR}
git reset HEAD
@@ -115,7 +121,9 @@ git add package.json config.xml install.sh www/js/config.js www/manifest.json
if [[ $? -ne 0 ]]; then
exit 1
fi
-git commit -m "v$2" && git tag -f "v$2" && git push
+git commit -m "v$2"
+git tag -f -a "v$2" -m "${description}"
+git push origin "v$2"
if [[ $? -ne 0 ]]; then
exit 1
fi
@@ -136,10 +144,6 @@ echo "**********************************"
echo " Waiting 40s, for propagation to github..."
sleep 40s
-description="$4"
-if [[ "_$description" == "_" ]]; then
- description="Release v$2"
-fi
./github.sh $1 ''"$description"''
if [[ $? -ne 0 ]]; then
--
GitLab