diff --git a/.gitignore b/.gitignore index 8606cd2..bdc173e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /watchdog /cmd/watchdog/watchdog xversion.go +*.json diff --git a/cmd/watchdog/version.go b/cmd/watchdog/version.go new file mode 100644 index 0000000..acf3f1d --- /dev/null +++ b/cmd/watchdog/version.go @@ -0,0 +1,7 @@ +package main + +// Fallback to recent version if not in a git repository +func init() { + GitVersion = "v1.1.2" + GitTimestamp = "2019-06-21T00:54:34-06:00" +} diff --git a/cmd/watchdog/watchdog.go b/cmd/watchdog/watchdog.go index 43cdc07..48a8abe 100644 --- a/cmd/watchdog/watchdog.go +++ b/cmd/watchdog/watchdog.go @@ -14,11 +14,7 @@ import ( watchdog "git.rootprojects.org/root/watchdog.go" ) -var ( - GitRev = "00000000" - GitVersion = "v0.0.0" - GitTimestamp = "0000-00-00T00:00:00Z" -) +var GitRev, GitVersion, GitTimestamp string func usage() { fmt.Println("Usage: watchdog -c config.json") diff --git a/go.mod b/go.mod index 30a4ae6..258910d 100644 --- a/go.mod +++ b/go.mod @@ -2,4 +2,4 @@ module git.rootprojects.org/root/watchdog.go go 1.12 -require git.rootprojects.org/root/go-gitver v1.1.0 +require git.rootprojects.org/root/go-gitver v1.1.1 diff --git a/go.sum b/go.sum index 859fc09..d2c4ce5 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,4 @@ git.rootprojects.org/root/go-gitver v1.1.0 h1:ANQUnUXYgbDR+WaMcI+PQQjLnxlCbAZCD/zivkrf8fY= git.rootprojects.org/root/go-gitver v1.1.0/go.mod h1:Rj1v3TBhvdaSphFEqMynUYwAz/4f+wY/+syBTvRrmlI= +git.rootprojects.org/root/go-gitver v1.1.1 h1:5b0lxnTYnft5hqpln0XCrJaGPH0SKzhPaazVAvAlZ8I= +git.rootprojects.org/root/go-gitver v1.1.1/go.mod h1:Rj1v3TBhvdaSphFEqMynUYwAz/4f+wY/+syBTvRrmlI= diff --git a/vendor/git.rootprojects.org/root/go-gitver/README.md b/vendor/git.rootprojects.org/root/go-gitver/README.md index 716a6c7..7f8752f 100644 --- a/vendor/git.rootprojects.org/root/go-gitver/README.md +++ b/vendor/git.rootprojects.org/root/go-gitver/README.md @@ -60,7 +60,7 @@ You don't have to use `mod vendor`, but I highly recommend it. # Options -``` +```txt version print version and exit --fail exit with non-zero status code on failure --package will set the package name @@ -69,7 +69,7 @@ version print version and exit ENVs -``` +```bash # Alias for --fail GITVER_FAIL=true ``` @@ -142,7 +142,7 @@ the repository in itself and that would be... weird. # Why a tools package? -> import "git.rootprojects.org/root/go-gitver" is a program, not an importable package +> import "git.rootprojects.org/root/go-gitver" is a program, not an importable package Having a tools package with a build tag that you don't use is a nice way to add exact versions of a command package used for tooling to your `go.mod` with `go mod tidy`, diff --git a/vendor/git.rootprojects.org/root/go-gitver/gitver.go b/vendor/git.rootprojects.org/root/go-gitver/gitver.go index 041b502..574fffa 100644 --- a/vendor/git.rootprojects.org/root/go-gitver/gitver.go +++ b/vendor/git.rootprojects.org/root/go-gitver/gitver.go @@ -209,9 +209,9 @@ package {{ .Package }} func init() { GitRev = "{{ .GitRev }}" - if "" != "{{ .Version }}" { - GitVersion = "{{ .Version }}" - } + {{- if .Version }} + GitVersion = "{{ .Version }}" + {{ end -}} GitTimestamp = "{{ .Timestamp }}" } `)) diff --git a/vendor/modules.txt b/vendor/modules.txt index acdb8d4..dbbfce7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,2 +1,2 @@ -# git.rootprojects.org/root/go-gitver v1.1.0 +# git.rootprojects.org/root/go-gitver v1.1.1 git.rootprojects.org/root/go-gitver