black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-22 16:41:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tag detect

Browse source
This commit is contained in:
世界 2023-08-07 20:08:11 +08:00
parent 09ffa2c66e
commit 2675aff98a
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cmd/internal/build_shared/tag.go
View file

@ -1,6 +1,9 @@
package build_shared package build_shared
import "github.com/sagernet/sing/common/shell" import (
"github.com/sagernet/sing-box/common/badversion"
"github.com/sagernet/sing/common/shell"
)
func ReadTag() (string, error) { func ReadTag() (string, error) {
currentTag, err := shell.Exec("git", "describe", "--tags").ReadOutput() currentTag, err := shell.Exec("git", "describe", "--tags").ReadOutput()
@ -12,5 +15,9 @@ func ReadTag() (string, error) {
return currentTag[1:], nil return currentTag[1:], nil
} }
shortCommit, _ := shell.Exec("git", "rev-parse", "--short", "HEAD").ReadOutput() shortCommit, _ := shell.Exec("git", "rev-parse", "--short", "HEAD").ReadOutput()
return currentTagRev[1:] + "-" + shortCommit, nil version := badversion.Parse(currentTagRev[1:])
if version.PreReleaseIdentifier == "" {
version.Patch++
}
return version.String() + "-" + shortCommit, nil
} }

18
common/badversion/version.go
View file

@ -11,6 +11,7 @@ type Version struct {
Major int Major int
Minor int Minor int
Patch int Patch int
Commit string
PreReleaseIdentifier string PreReleaseIdentifier string
PreReleaseVersion int PreReleaseVersion int
} }
@ -37,16 +38,21 @@ func (v Version) After(anotherVersion Version) bool {
return false return false
} }
if v.PreReleaseIdentifier != "" && anotherVersion.PreReleaseIdentifier != "" { if v.PreReleaseIdentifier != "" && anotherVersion.PreReleaseIdentifier != "" {
if v.PreReleaseIdentifier == "beta" && anotherVersion.PreReleaseIdentifier == "alpha" { if v.PreReleaseIdentifier == anotherVersion.PreReleaseIdentifier {
return true
} else if v.PreReleaseIdentifier == "alpha" && anotherVersion.PreReleaseIdentifier == "beta" {
return false
}
if v.PreReleaseVersion > anotherVersion.PreReleaseVersion { if v.PreReleaseVersion > anotherVersion.PreReleaseVersion {
return true return true
} else if v.PreReleaseVersion < anotherVersion.PreReleaseVersion { } else if v.PreReleaseVersion < anotherVersion.PreReleaseVersion {
return false return false
} }
} else if v.PreReleaseIdentifier == "rc" && anotherVersion.PreReleaseIdentifier == "beta" {
return true
} else if v.PreReleaseIdentifier == "beta" && anotherVersion.PreReleaseIdentifier == "rc" {
return false
} else if v.PreReleaseIdentifier == "beta" && anotherVersion.PreReleaseIdentifier == "alpha" {
return true
} else if v.PreReleaseIdentifier == "alpha" && anotherVersion.PreReleaseIdentifier == "beta" {
return false
}
} }
return false return false
} }
@ -95,7 +101,7 @@ func Parse(versionName string) (version Version) {
version.PreReleaseIdentifier = "beta" version.PreReleaseIdentifier = "beta"
version.PreReleaseVersion, _ = strconv.Atoi(identifier[4:]) version.PreReleaseVersion, _ = strconv.Atoi(identifier[4:])
} else { } else {
version.PreReleaseIdentifier = identifier version.Commit = identifier
} }
} }
} }