branch name logic

Author: linkdata

internal/gitsemver/gitsemver.go

@@ -159,36 +159,43 @@ func (vs *GitSemVer) GetTag(repo string) (tag string, match bool, err error) {
 }
 
 func (vs *GitSemVer) getBranchGitHub(repo string) (branchName string, err error) {
-	if branchName = strings.TrimSpace(vs.Env.Getenv("GITHUB_BASE_REF")); branchName == "" {
-		if branchName = strings.TrimSpace(vs.Env.Getenv("GITHUB_REF_NAME")); branchName != "" {
-			if strings.TrimSpace(vs.Env.Getenv("GITHUB_REF_TYPE")) == "tag" {
-				var branches []string
-				if branches, err = vs.Git.GetBranchesFromTag(repo, branchName); err == nil {
-					for _, branchName = range branches {
-						if vs.IsReleaseBranch(branchName) {
-							return
-						}
-					}
-				}
+	if branchName = strings.TrimSpace(vs.Env.Getenv("GITHUB_BASE_REF")); branchName != "" {
+		return
+	}
+	refName := strings.TrimSpace(vs.Env.Getenv("GITHUB_REF_NAME"))
+	if refName == "" {
+		return
+	}
+	if strings.TrimSpace(vs.Env.Getenv("GITHUB_REF_TYPE")) != "tag" {
+		return refName, nil
+	}
+	var branches []string
+	if branches, err = vs.Git.GetBranchesFromTag(repo, refName); err == nil {
+		for _, candidate := range branches {
+			if vs.IsReleaseBranch(candidate) {
+				return candidate, nil
 			}
 		}
 	}
 	return
 }
 
 func (vs *GitSemVer) getBranchGitLab(repo string) (branchName string, err error) {
-	if branchName = strings.TrimSpace(vs.Env.Getenv("CI_COMMIT_REF_NAME")); branchName != "" {
-		if strings.TrimSpace(vs.Env.Getenv("CI_COMMIT_TAG")) == branchName {
-			var branches []string
-			if branches, err = vs.Git.GetBranchesFromTag(repo, branchName); err == nil {
-				for _, branchName = range branches {
-					if vs.IsReleaseBranch(branchName) {
-						return
-					}
-				}
+	if branchName = strings.TrimSpace(vs.Env.Getenv("CI_COMMIT_REF_NAME")); branchName == "" {
+		return
+	}
+	if strings.TrimSpace(vs.Env.Getenv("CI_COMMIT_TAG")) != branchName {
+		return branchName, nil
+	}
+	var branches []string
+	if branches, err = vs.Git.GetBranchesFromTag(repo, branchName); err == nil {
+		for _, candidate := range branches {
+			if vs.IsReleaseBranch(candidate) {
+				return candidate, nil
 			}
 		}
 	}
+	branchName = ""
 	return
 }
 

internal/gitsemver/gitsemver_test.go

@@ -225,7 +225,33 @@ func Test_VersionStringer_GetBranchFromTag_GitHub(t *testing.T) {
 	env["GITHUB_REF_NAME"] = "v1"
 	name, err = vs.GetBranch(".")
 	isEqual(t, err, nil)
-	isEqual(t, "onepointoh", name)
+	isEqual(t, "", name)
+}
+
+func Test_VersionStringer_GetBranchFromTag_GitHub_NoContainingBranch(t *testing.T) {
+	env := MockEnvironment{}
+	git := &MockGitter{}
+	vs := gitsemver.GitSemVer{Git: git, Env: env}
+
+	git.branch = "detached"
+	env["GITHUB_REF_TYPE"] = "tag"
+	env["GITHUB_REF_NAME"] = "v2.5.0"
+	name, err := vs.GetBranch(".")
+	isEqual(t, err, nil)
+	isEqual(t, "", name)
+}
+
+func Test_VersionStringer_GetBranchFromTag_GitLab_NoReleaseBranch(t *testing.T) {
+	env := MockEnvironment{}
+	git := &MockGitter{}
+	vs := gitsemver.GitSemVer{Git: git, Env: env}
+
+	git.branch = "detached"
+	env["CI_COMMIT_TAG"] = "v1"
+	env["CI_COMMIT_REF_NAME"] = "v1"
+	name, err := vs.GetBranch(".")
+	isEqual(t, err, nil)
+	isEqual(t, "", name)
 }
 
 func Test_VersionStringer_GetBuild(t *testing.T) {