oss/forgejo-runner
oss/forgejo-runner
1
0
Fork 0
mirror of https://code.forgejo.org/forgejo/runner.git synced 2025-08-11 17:50:58 +00:00
Code Wiki Activity

fix: panic on regex in main.workflow

Browse source 
fixes #12
This commit is contained in:
Casey Lee 2019-01-18 13:28:53 -08:00
parent a36aeb18f3
commit f830665a46
4 changed files with 56 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

15
common/git.go
View file

@ -30,20 +30,20 @@ func FindGitRevision(file string) (shortSha string, sha string, err error) {
return "", "", err
}
head, err := findGitHead(file)
ref, err := FindGitRef(file)
if err != nil {
return "", "", err
}
var refBuf []byte
if strings.HasPrefix(head, "refs/") {
if strings.HasPrefix(ref, "refs/") {
// load commitid ref
refBuf, err = ioutil.ReadFile(fmt.Sprintf("%s/%s", gitDir, head))
refBuf, err = ioutil.ReadFile(fmt.Sprintf("%s/%s", gitDir, ref))
if err != nil {
return "", "", err
}
} else {
refBuf = []byte(head)
refBuf = []byte(ref)
}
log.Debugf("Found revision: %s", refBuf)
@ -52,18 +52,19 @@ func FindGitRevision(file string) (shortSha string, sha string, err error) {
// FindGitBranch get the current git branch
func FindGitBranch(file string) (string, error) {
head, err := findGitHead(file)
ref, err := FindGitRef(file)
if err != nil {
return "", err
}
// get branch name
branch := strings.TrimPrefix(head, "refs/heads/")
branch := strings.TrimPrefix(ref, "refs/heads/")
log.Debugf("Found branch: %s", branch)
return branch, nil
}
func findGitHead(file string) (string, error) {
// FindGitRef get the current git ref
func FindGitRef(file string) (string, error) {
gitDir, err := findGitDirectory(file)
if err != nil {
return "", err