internal/build: add support for git tag in local Environment

I didn't add this initially because the command I tried was too slow.
The 'git for-each-ref ...' invocation takes 40ms on my machine. That
ought to be acceptable.
pull/3317/head
Felix Lange 8 years ago
parent 92959cd4ef
commit e1e2df656a
  1. 5
      internal/build/env.go
  2. 7
      internal/build/util.go

@ -88,8 +88,9 @@ func LocalEnv() Environment {
env.Branch = b
}
}
// Note that we don't get the current git tag. It would slow down
// builds and isn't used by anything.
if env.Tag == "" {
env.Tag = RunGit("for-each-ref", "--points-at=HEAD", "--count=1", "--format=%(refname:short)", "refs/tags")
}
return env
}

@ -76,6 +76,8 @@ func VERSION() string {
return string(bytes.TrimSpace(version))
}
var warnedAboutGit bool
// RunGit runs a git subcommand and returns its output.
// The command must complete successfully.
func RunGit(args ...string) string {
@ -83,7 +85,10 @@ func RunGit(args ...string) string {
var stdout, stderr bytes.Buffer
cmd.Stdout, cmd.Stderr = &stdout, &stderr
if err := cmd.Run(); err == exec.ErrNotFound {
log.Println("no git in PATH")
if !warnedAboutGit {
log.Println("Warning: can't find 'git' in PATH")
warnedAboutGit = true
}
return ""
} else if err != nil {
log.Fatal(strings.Join(cmd.Args, " "), ": ", err, "\n", stderr.String())

Loading…
Cancel
Save