branch name logic

Author: linkdata

internal/gitsemver/gitsemver.go

@@ -155,11 +155,15 @@ 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 != "" {
+	// Pull request events expose the source branch as GITHUB_HEAD_REF.
+	// Prefer this so PR builds are not mistaken for base-branch releases.
+	if branchName = strings.TrimSpace(vs.Env.Getenv("GITHUB_HEAD_REF")); branchName != "" {
 		return
 	}
 	refName := strings.TrimSpace(vs.Env.Getenv("GITHUB_REF_NAME"))
 	if refName == "" {
+		// Fallback for contexts that only expose a base branch.
+		branchName = strings.TrimSpace(vs.Env.Getenv("GITHUB_BASE_REF"))
 		return
 	}
 	if strings.TrimSpace(vs.Env.Getenv("GITHUB_REF_TYPE")) != "tag" {

internal/gitsemver/gitsemver_test.go

@@ -163,6 +163,18 @@ func Test_VersionStringer_GetBranch(t *testing.T) {
 	delete(env, "GITHUB_REF_NAME")
 	git.branch = ""
 
+	git.branch = "detached"
+	env["GITHUB_HEAD_REF"] = "feature/foo"
+	env["GITHUB_BASE_REF"] = "main"
+	env["GITHUB_REF_NAME"] = "123/merge"
+	name, err = vs.GetBranch(".")
+	isEqual(t, err, nil)
+	isEqual(t, "feature/foo", name)
+	delete(env, "GITHUB_HEAD_REF")
+	delete(env, "GITHUB_BASE_REF")
+	delete(env, "GITHUB_REF_NAME")
+	git.branch = ""
+
 	git.branch = "detached"
 	env["GITHUB_REF_TYPE"] = "tag"
 	env["GITHUB_REF_NAME"] = "v1.0.0"