Compare commits
1
Commits
51a5d71b8a
..
next
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
070090124a |
@@ -63,7 +63,8 @@ func New() (*Globals, error) {
|
|||||||
// a release. "dev" and goreleaser's snapshot "dev-<sha>" count, and so
|
// a release. "dev" and goreleaser's snapshot "dev-<sha>" count, and so
|
||||||
// does what `git describe --tags --always --dirty` gives a make or
|
// does what `git describe --tags --always --dirty` gives a make or
|
||||||
// docker build of an untagged commit: the bare short commit, or
|
// docker build of an untagged commit: the bare short commit, or
|
||||||
// tag-N-gHASH on a commit after a tag, either with or without "-dirty".
|
// tag-N-gHASH on a commit after a tag. Any version ending in "-dirty"
|
||||||
|
// counts, a modified checkout of a tag ("v1.0.0-dirty") included.
|
||||||
// A plain tag such as "v1.0.0" or "1.0.0" is a release.
|
// A plain tag such as "v1.0.0" or "1.0.0" is a release.
|
||||||
//
|
//
|
||||||
// The empty string counts too. Nothing that knows its version reports
|
// The empty string counts too. Nothing that knows its version reports
|
||||||
@@ -73,11 +74,12 @@ func New() (*Globals, error) {
|
|||||||
// case; this is the second line of defence, for a binary linked by
|
// case; this is the second line of defence, for a binary linked by
|
||||||
// something other than the Makefile.
|
// something other than the Makefile.
|
||||||
func IsDevVersion(v string) bool {
|
func IsDevVersion(v string) bool {
|
||||||
if v == "" || v == DevVersion || strings.HasPrefix(v, DevVersion+"-") {
|
if v == "" || v == DevVersion || strings.HasPrefix(v, DevVersion+"-") ||
|
||||||
|
strings.HasSuffix(v, "-dirty") {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
return regexp.MustCompile(`^(.+-[0-9]+-g)?[0-9a-f]+(-dirty)?$`).MatchString(v)
|
return regexp.MustCompile(`^(.+-[0-9]+-g)?[0-9a-f]+$`).MatchString(v)
|
||||||
}
|
}
|
||||||
|
|
||||||
// shortCommitLen is the number of commit-hash characters ShortCommit keeps.
|
// shortCommitLen is the number of commit-hash characters ShortCommit keeps.
|
||||||
|
|||||||
@@ -57,6 +57,8 @@ func TestIsDevVersion(t *testing.T) {
|
|||||||
{"v1.0.0-3-g877eb2f", true},
|
{"v1.0.0-3-g877eb2f", true},
|
||||||
{"v1.0.0-3-g877eb2f-dirty", true},
|
{"v1.0.0-3-g877eb2f-dirty", true},
|
||||||
{"1.0.0-rc.1-12-g877eb2f", true},
|
{"1.0.0-rc.1-12-g877eb2f", true},
|
||||||
|
// A tagged commit with uncommitted changes is not that tag.
|
||||||
|
{"v1.0.0-dirty", true},
|
||||||
// What a tagged build produces (goreleaser's .Version strips
|
// What a tagged build produces (goreleaser's .Version strips
|
||||||
// the leading "v"; script/version keeps it).
|
// the leading "v"; script/version keeps it).
|
||||||
{"1.0.0", false},
|
{"1.0.0", false},
|
||||||
|
|||||||
Reference in New Issue
Block a user