potyarkin/forgejo-runner-act
1
0
Fork 0
Code Issues Pull requests Activity

Merge branch 'master' into watch

Browse source
This commit is contained in:
Casey Lee 2019-02-12 23:29:54 -05:00 • committed by GitHub
commit 4228018177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
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)
return string(refBuf[:7]), string(refBuf), nil
return string(refBuf[:7]), strings.TrimSpace(string(refBuf)), nil
}
// FindGitBranch get the current git branch
@ -90,14 +90,14 @@ func FindGitRef(file string) (string, error) {
head := make(map[string]string)
err = yaml.Unmarshal(headBytes, head)
if err != nil {
ref = strings.TrimRight(string(headBytes), "\r\n")
ref = string(headBytes)
} else {
ref = head["ref"]
}
log.Debugf("HEAD points to '%s'", ref)
return ref, nil
return strings.TrimSpace(ref), nil
}
// FindGithubRepo get the repo
@ -137,7 +137,7 @@ func findGitSlug(url string) (string, string, error) {
codeCommitHTTPRegex := regexp.MustCompile(`^http(s?)://git-codecommit\.(.+)\.amazonaws.com/v1/repos/(.+)$`)
codeCommitSSHRegex := regexp.MustCompile(`ssh://git-codecommit\.(.+)\.amazonaws.com/v1/repos/(.+)$`)
httpRegex := regexp.MustCompile("^http(s?)://.*github.com.*/(.+)/(.+).git$")
sshRegex := regexp.MustCompile("github.com:(.+)/(.+).git$")
sshRegex := regexp.MustCompile("github.com[:/](.+)/(.+).git$")
if matches := codeCommitHTTPRegex.FindStringSubmatch(url); matches != nil {
return "CodeCommit", matches[3], nil

1
common/git_test.go
View file

@ -25,6 +25,7 @@ func TestFindGitSlug(t *testing.T) {
{"git@github.com:nektos/act.git", "GitHub", "nektos/act"},
{"https://github.com/nektos/act.git", "GitHub", "nektos/act"},
{"http://github.com/nektos/act.git", "GitHub", "nektos/act"},
{"git+ssh://git@github.com/owner/repo.git", "GitHub", "owner/repo"},
{"http://myotherrepo.com/act.git", "", "http://myotherrepo.com/act.git"},
}