Merge pull request #131 from capsule8/tt/buildkite-env

Add buildkite support through environment variables
mattn · Mar 25, 2019 · 900af2b · 900af2b
2 parents dc71fe1 + cefa7fb
commit 900af2b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/gitinfo.go b/gitinfo.go
@@ -75,7 +75,7 @@ func collectGitInfo() *Git {
 }
 
 func loadBranchFromEnv() string {
-	varNames := []string{"GIT_BRANCH", "CIRCLE_BRANCH", "TRAVIS_BRANCH", "CI_BRANCH", "APPVEYOR_REPO_BRANCH", "WERCKER_GIT_BRANCH", "DRONE_BRANCH", "BRANCH_NAME"}
+	varNames := []string{"GIT_BRANCH", "CIRCLE_BRANCH", "TRAVIS_BRANCH", "CI_BRANCH", "APPVEYOR_REPO_BRANCH", "WERCKER_GIT_BRANCH", "DRONE_BRANCH", "BUILDKITE_BRANCH", "BRANCH_NAME"}
 	for _, varName := range varNames {
 		if branch := os.Getenv(varName); branch != "" {
 			return branch

diff --git a/gitinfo_test.go b/gitinfo_test.go
@@ -21,6 +21,7 @@ func TestLoadBranchFromEnv(t *testing.T) {
 				"APPVEYOR_REPO_BRANCH": "appveyor-master",
 				"WERCKER_GIT_BRANCH":   "wercker-master",
 				"DRONE_BRANCH":         "drone-master",
+				"BUILDKITE_BRANCH":     "buildkite-master",
 				"BRANCH_NAME":          "jenkins-master",
 			},
 			"master",
@@ -34,6 +35,7 @@ func TestLoadBranchFromEnv(t *testing.T) {
 				"APPVEYOR_REPO_BRANCH": "appveyor-master",
 				"WERCKER_GIT_BRANCH":   "wercker-master",
 				"DRONE_BRANCH":         "drone-master",
+				"BUILDKITE_BRANCH":     "buildkite-master",
 				"BRANCH_NAME":          "jenkins-master",
 			},
 			"circle-master",
@@ -46,6 +48,7 @@ func TestLoadBranchFromEnv(t *testing.T) {
 				"APPVEYOR_REPO_BRANCH": "appveyor-master",
 				"WERCKER_GIT_BRANCH":   "wercker-master",
 				"DRONE_BRANCH":         "drone-master",
+				"BUILDKITE_BRANCH":     "buildkite-master",
 				"BRANCH_NAME":          "jenkins-master",
 			},
 			"travis-master",
@@ -78,6 +81,13 @@ func TestLoadBranchFromEnv(t *testing.T) {
 			},
 			"jenkins-master",
 		},
+		{
+			"only BUILDKITE_BRANCH defined",
+			map[string]string{
+				"BUILDKITE_BRANCH": "buildkite-master",
+			},
+			"buildkite-master",
+		},
 		{
 			"only DRONE_BRANCH defined",
 			map[string]string{
@@ -101,7 +111,7 @@ func TestLoadBranchFromEnv(t *testing.T) {
 }
 
 func resetBranchEnvs(values map[string]string) {
-	for _, envVar := range []string{"CI_BRANCH", "CIRCLE_BRANCH", "GIT_BRANCH", "TRAVIS_BRANCH", "APPVEYOR_REPO_BRANCH", "WERCKER_GIT_BRANCH", "DRONE_BRANCH", "BRANCH_NAME"} {
+	for _, envVar := range []string{"CI_BRANCH", "CIRCLE_BRANCH", "GIT_BRANCH", "TRAVIS_BRANCH", "APPVEYOR_REPO_BRANCH", "WERCKER_GIT_BRANCH", "DRONE_BRANCH", "BUILDKITE_BRANCH", "BRANCH_NAME"} {
 		os.Unsetenv(envVar)
 	}
 	for k, v := range values {

diff --git a/goveralls.go b/goveralls.go
@@ -255,6 +255,8 @@ func process() error {
 		jobId = jenkinsJobId
 	} else if droneBuildNumber := os.Getenv("DRONE_BUILD_NUMBER"); droneBuildNumber != "" {
 		jobId = droneBuildNumber
+	} else if buildkiteBuildNumber := os.Getenv("BUILDKITE_BUILD_NUMBER"); buildkiteBuildNumber != "" {
+		jobId = buildkiteBuildNumber
 	}
 
 	if *repotoken == "" {
@@ -275,6 +277,8 @@ func process() error {
 		pullRequest = prNumber
 	} else if prNumber := os.Getenv("DRONE_PULL_REQUEST"); prNumber != "" {
 		pullRequest = prNumber
+	} else if prNumber := os.Getenv("BUILDKITE_PULL_REQUEST"); prNumber != "" {
+		pullRequest = prNumber
 	}
 
 	sourceFiles, err := getCoverage()