From 7e92f699a955de68908ecc22b36a63d96ae72e02 Mon Sep 17 00:00:00 2001 From: Casey Lee Date: Tue, 12 Feb 2019 23:02:24 -0500 Subject: [PATCH 1/2] fix #31 - trim whitespace on git revision --- common/git.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/git.go b/common/git.go index a2f7925..ed16854 100644 --- a/common/git.go +++ b/common/git.go @@ -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 From af08b30ee56e834e17e759383710a8ed0a5b5b69 Mon Sep 17 00:00:00 2001 From: Casey Lee Date: Tue, 12 Feb 2019 23:08:07 -0500 Subject: [PATCH 2/2] fix #26 - improve regex for matching github repo. add unit test to cover --- common/git.go | 2 +- common/git_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/git.go b/common/git.go index ed16854..edcd105 100644 --- a/common/git.go +++ b/common/git.go @@ -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 diff --git a/common/git_test.go b/common/git_test.go index e5f4e9e..f1312d1 100644 --- a/common/git_test.go +++ b/common/git_test.go @@ -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"}, }