Skip to content

Commit

Permalink
Support Drone environment variables
Browse files Browse the repository at this point in the history
Drone used to support the CI_ environment variables, but they stopped
doing so.

Environment reference for Drone 0.{8,9}: https://0-8-0.docs.drone.io/environment-reference/

Environment reference for Drone 1.0 (upcoming release): https://docs.drone.io/reference/environ/
  • Loading branch information
fsouza committed Dec 31, 2018
1 parent 09de9e3 commit f252627
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gitinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func collectGitInfo() *Git {
}

func loadBranchFromEnv() string {
varNames := []string{"GIT_BRANCH", "CIRCLE_BRANCH", "TRAVIS_BRANCH", "CI_BRANCH", "APPVEYOR_REPO_BRANCH", "WERCKER_GIT_BRANCH", "BRANCH_NAME"}
varNames := []string{"GIT_BRANCH", "CIRCLE_BRANCH", "TRAVIS_BRANCH", "CI_BRANCH", "APPVEYOR_REPO_BRANCH", "WERCKER_GIT_BRANCH", "DRONE_BRANCH", "BRANCH_NAME"}
for _, varName := range varNames {
if branch := os.Getenv(varName); branch != "" {
return branch
Expand Down
12 changes: 11 additions & 1 deletion gitinfo_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ func TestLoadBranchFromEnv(t *testing.T) {
"CI_BRANCH": "ci-master",
"APPVEYOR_REPO_BRANCH": "appveyor-master",
"WERCKER_GIT_BRANCH": "wercker-master",
"DRONE_BRANCH": "drone-master",
"BRANCH_NAME": "jenkins-master",
},
"master",
Expand All @@ -32,6 +33,7 @@ func TestLoadBranchFromEnv(t *testing.T) {
"CI_BRANCH": "ci-master",
"APPVEYOR_REPO_BRANCH": "appveyor-master",
"WERCKER_GIT_BRANCH": "wercker-master",
"DRONE_BRANCH": "drone-master",
"BRANCH_NAME": "jenkins-master",
},
"circle-master",
Expand All @@ -43,6 +45,7 @@ func TestLoadBranchFromEnv(t *testing.T) {
"CI_BRANCH": "ci-master",
"APPVEYOR_REPO_BRANCH": "appveyor-master",
"WERCKER_GIT_BRANCH": "wercker-master",
"DRONE_BRANCH": "drone-master",
"BRANCH_NAME": "jenkins-master",
},
"travis-master",
Expand Down Expand Up @@ -75,6 +78,13 @@ func TestLoadBranchFromEnv(t *testing.T) {
},
"jenkins-master",
},
{
"only DRONE_BRANCH defined",
map[string]string{
"DRONE_BRANCH": "drone-master",
},
"drone-master",
},
{
"no branch var defined",
map[string]string{},
Expand All @@ -91,7 +101,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", "BRANCH_NAME"} {
for _, envVar := range []string{"CI_BRANCH", "CIRCLE_BRANCH", "GIT_BRANCH", "TRAVIS_BRANCH", "APPVEYOR_REPO_BRANCH", "WERCKER_GIT_BRANCH", "DRONE_BRANCH", "BRANCH_NAME"} {
os.Unsetenv(envVar)
}
for k, v := range values {
Expand Down
4 changes: 4 additions & 0 deletions goveralls.go
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ func process() error {
jobId = semaphoreJobId
} else if jenkinsJobId := os.Getenv("BUILD_NUMBER"); jenkinsJobId != "" {
jobId = jenkinsJobId
} else if droneBuildNumber := os.Getenv("DRONE_BUILD_NUMBER"); droneBuildNumber != "" {
jobId = droneBuildNumber
}

if *repotoken == "" {
Expand All @@ -271,6 +273,8 @@ func process() error {
pullRequest = prNumber
} else if prNumber := os.Getenv("PULL_REQUEST_NUMBER"); prNumber != "" {
pullRequest = prNumber
} else if prNumber := os.Getenv("DRONE_PULL_REQUEST"); prNumber != "" {
pullRequest = prNumber
}

sourceFiles, err := getCoverage()
Expand Down

0 comments on commit f252627

Please sign in to comment.