X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=tools%2Fbuild-version.go;h=ead81a43c2ed4321ec6d61ecba50edfe59222fad;hb=90304fb472fab5a9809feb0d9b23b0930619cf0d;hp=7a60307c56e3aceb1680449c52d6c28e7a4c5ee4;hpb=9d2915c32841822e5b5a41bcb5935af2746db12e;p=micro.git

diff --git a/tools/build-version.go b/tools/build-version.go
index 7a60307c..ead81a43 100644
--- a/tools/build-version.go
+++ b/tools/build-version.go
@@ -5,7 +5,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/zyedidia/micro/tools/semver"
+	"github.com/blang/semver"
 )
 
 func getTag(match ...string) (string, *semver.PRVersion) {
@@ -20,9 +20,13 @@ func getTag(match ...string) (string, *semver.PRVersion) {
 			if ahead, err := semver.NewPRVersion(tagParts[1]); err == nil {
 				return tagParts[0], &ahead
 			}
+		} else if len(tagParts) == 4 {
+			if ahead, err := semver.NewPRVersion(tagParts[2]); err == nil {
+				return tagParts[0] + "-" + tagParts[1], &ahead
+			}
 		}
 
-		return tagParts[0], nil
+		return string(tag), nil
 	}
 }
 
@@ -49,7 +53,9 @@ func main() {
 		tag = "dev"
 	}
 	// Get the most likely next version:
-	version.Patch = version.Patch + 1
+	if !strings.Contains(version.String(), "rc") {
+		version.Patch = version.Patch + 1
+	}
 
 	if pr, err := semver.NewPRVersion(tag); err == nil {
 		// append the tag as pre-release name