fixed releasebot issues with multiple branches

mart-vi · Jan 12, 2018 · 93ceae3 · 93ceae3
1 parent 2bf31a1
commit 93ceae3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/release b/release
@@ -4,7 +4,10 @@ NEW="$1"
 
 [ "$NEW" != "" ] || exit 1
 
-PREV=`git tag --sort=creatordate|tail -1`
+echo "Creating release $NEW"
+
+NEWBASE=`echo "$NEW"|cut -f1 -d'-'`
+PREV=`git tag --sort=creatordate|grep "^$NEWBASE"|tail -1`
 
 ############## update Release_notes.txt
 NOTES="dist/Release_notes.txt"

diff --git a/releasebot b/releasebot
@@ -5,9 +5,8 @@
 git pull
 
 #new commits since last tag?
-if ! git describe --exact-match 2>/dev/null; then
-    BRANCH=`git rev-parse --abbrev-ref HEAD`
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+if ! git describe --exact-match 2>/dev/null | grep "^$BRANCH"; then
     TAG="$BRANCH-`date +%Y%m%d`"
     ./release "$TAG"
 fi
-