felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

build: Replace hypen in -dirty for version (ref #6758) (#6858)

Browse Source
This commit is contained in:
Simon Frei
2020-07-28 10:58:01 +02:00
committed by GitHub
parent 08e0f938a9
commit 21dd9d6b43
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.go
+4 -1
View File
@@ -874,7 +874,10 @@ func getGitVersion() (string, error) {
} }
v0 := string(bs) v0 := string(bs)
versionRe := regexp.MustCompile(`-([0-9]{1,3}-g[0-9a-f]{5,10})`) // To be more semantic-versionish and ensure proper ordering in our
// upgrade process, we make sure there's only one hypen in the version.
versionRe := regexp.MustCompile(`-([0-9]{1,3}-g[0-9a-f]{5,10}(-dirty)?)`)
if m := versionRe.FindStringSubmatch(vcur); len(m) > 0 { if m := versionRe.FindStringSubmatch(vcur); len(m) > 0 {
suffix := strings.ReplaceAll(m[1], "-", ".") suffix := strings.ReplaceAll(m[1], "-", ".")