yume/act
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix - trim whitespace on git revision

Browse source
This commit is contained in:
Casey Lee 2019-02-12 23:02:24 -05:00
parent de62a2eece
commit 7e92f699a9
No known key found for this signature in database
GPG key ID: 1899120ECD0A1784
1 changed files with 3 additions and 3 deletions

6
common/git.go
View file

@ -46,7 +46,7 @@ func FindGitRevision(file string) (shortSha string, sha string, err error) {
} }
log.Debugf("Found revision: %s", refBuf) log.Debugf("Found revision: %s", refBuf)
return string(refBuf[:7]), string(refBuf), nil return string(refBuf[:7]), strings.TrimSpace(string(refBuf)), nil
} }
// FindGitBranch get the current git branch // FindGitBranch get the current git branch
@ -90,14 +90,14 @@ func FindGitRef(file string) (string, error) {
head := make(map[string]string) head := make(map[string]string)
err = yaml.Unmarshal(headBytes, head) err = yaml.Unmarshal(headBytes, head)
if err != nil { if err != nil {
ref = strings.TrimRight(string(headBytes), "\r\n") ref = string(headBytes)
} else { } else {
ref = head["ref"] ref = head["ref"]
} }
log.Debugf("HEAD points to '%s'", ref) log.Debugf("HEAD points to '%s'", ref)
return ref, nil return strings.TrimSpace(ref), nil
} }
// FindGithubRepo get the repo // FindGithubRepo get the repo