🐛 Fix GitHub branch extraction for pull requests

JetBrains · Jan 22, 2024 · 1326824 · 1326824
1 parent c6398e9
commit 1326824
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/core/core_test.go b/core/core_test.go
@@ -237,6 +237,23 @@ func Test_ExtractEnvironmentVariables(t *testing.T) {
 			revisionExpected:  revisionExpected,
 			branchExpected:    branchExpected,
 		},
+		{
+			ci: "GitHub pull request",
+			variables: map[string]string{
+				"GITHUB_SERVER_URL": "https://github.jetbrains.com",
+				"GITHUB_REPOSITORY": "sa/entrypoint",
+				"GITHUB_RUN_ID":     "123456789",
+				"GITHUB_SHA":        revisionExpected,
+				"GITHUB_HEAD_REF":   branchExpected,
+				"GITHUB_REF":        "refs/pull/123/merge",
+			},
+			envExpected:       fmt.Sprintf("github-actions:%s", Version),
+			jobUrlExpected:    "https://github.jetbrains.com/sa/entrypoint/actions/runs/123456789",
+			remoteUrlExpected: "https://github.jetbrains.com/sa/entrypoint.git",
+			repoUrlExpected:   "https://github.jetbrains.com/sa/entrypoint",
+			revisionExpected:  revisionExpected,
+			branchExpected:    branchExpected,
+		},
 		{
 			ci: "CircleCI",
 			variables: map[string]string{

diff --git a/core/env.go b/core/env.go
@@ -126,6 +126,9 @@ func validateBranch(branch string, env string) string {
 	if branch == "" {
 		if env == "github-actions" {
 			branch = os.Getenv("GITHUB_REF")
+			if strings.Contains(branch, "/pull/") {
+				branch = os.Getenv("GITHUB_HEAD_REF")
+			}
 		} else if env == "azure-pipelines" {
 			branch = os.Getenv("BUILD_SOURCEBRANCHNAME")
 		} else if env == "jenkins" {