yanistyle/sing-box-extended
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-06-05 10:47:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update Makefile

Browse Source
This commit is contained in:
世界
2023-08-30 17:35:40 +08:00
parent c75e32e722
commit ea3731162b
4 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/internal/build_shared/tag.go
View File

@@ -2,6 +2,7 @@ package build_shared
import (
"github.com/sagernet/sing-box/common/badversion"
"github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/shell"
)
@@ -22,11 +23,14 @@ func ReadTag() (string, error) {
return version.String() + "-" + shortCommit, nil
}
func ReadTagVersion() (string, error) {
currentTagRev, err := shell.Exec("git", "describe", "--tags", "--abbrev=0").ReadOutput()
if err != nil {
return "", err
}
func ReadTagVersion() (badversion.Version, error) {
currentTag := common.Must1(shell.Exec("git", "describe", "--tags").ReadOutput())
currentTagRev := common.Must1(shell.Exec("git", "describe", "--tags", "--abbrev=0").ReadOutput())
version := badversion.Parse(currentTagRev[1:])
return version.VersionString(), nil
if currentTagRev != currentTag {
if version.PreReleaseIdentifier == "" {
version.Patch++
}
}
return version, nil
}