Fix wrong versioning on test branch issue

juliansangillo · Aug 25, 2020 · 16b2551 · 16b2551
1 parent 5cb314c
commit 16b2551
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/tag-version.sh b/src/tag-version.sh
@@ -36,7 +36,15 @@ getLatestRevision() {
 }
 
 getRevisionType() {
-	local MESSAGE="$(git show -s --format=%s HEAD)";
+    local BRANCH="$1";
+
+    if [ "$BRANCH" = "$DEV_BRANCH" ]; then
+        local MESSAGE="$(git show -s --format=%s HEAD)";
+    elif [ "$BRANCH" = "$TEST_BRANCH" ]; then
+        local MESSAGE="$(git show -s --format=%s HEAD~1)";
+    else
+        local MESSAGE="$(git show -s --format=%s HEAD~2)";
+    fi
 
 	outLog "Getting revision type from commit message ...";
 	outLog "(major, minor, build)";
@@ -109,7 +117,7 @@ pullRevisionIntoTest() {
 	outLog "Old Version: $OLD_VERSION";
 
 	split '.' $OLD_VERSION;
-	return_arr[3]="${test_BRANCH^^}";
+	return_arr[3]="${TEST_BRANCH^^}";
 
 	echo "$(join . ${return_arr[@]})"
 }