Skip to content

Commit b12b395

Browse files
authored
Merge pull request #38 from kichristensen/changeToGithub
Change from Azure DevOps environment variables to Github environment variables
2 parents 9816193 + a91957a commit b12b395

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

releases/git.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ func getBranchName() string {
9797
func pickBranchName(refs []string) string {
9898
var branch string
9999

100-
if b, ok := os.LookupEnv("SYSTEM_PULLREQUEST_SOURCEBRANCH"); ok {
100+
if b, ok := os.LookupEnv("GITHUB_HEAD_REF"); ok {
101101
// pull request
102102
branch = b
103-
} else if b, ok := os.LookupEnv("BUILD_SOURCEBRANCH"); ok && !strings.HasPrefix(b, "refs/tags/") {
103+
} else if b, ok := os.LookupEnv("GITHUB_REF"); ok && !strings.HasPrefix(b, "refs/tags/") {
104104
// branch build
105-
// BUILD_SOURCEBRANCHNAME has the short name, e.g. main. BUILD_SOURCEBRANCH has the full name, e.g. refs/heads/main
105+
// GITHUB_REF_NAME has the short name, e.g. main. GITHUB_REF has the full name, e.g. refs/heads/main
106106
// They are populated for both tags and branches
107-
branch = os.Getenv("BUILD_SOURCEBRANCHNAME")
107+
branch = os.Getenv("GITHUB_REF_NAME")
108108
} else {
109109
// tag build
110110
// Detect if this was a tag on main or a release
@@ -138,7 +138,7 @@ func pickBranchName(refs []string) string {
138138

139139
func getPermalink() (string, bool) {
140140
// Use dev for pull requests
141-
if _, pr := os.LookupEnv("SYSTEM_PULLREQUEST_SOURCEBRANCH"); pr {
141+
if _, pr := os.LookupEnv("GITHUB_HEAD_REF"); pr {
142142
return "dev", false
143143
}
144144

releases/git_test.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
func TestPickBranchName(t *testing.T) {
1111
// These aren't set locally but are set on a CI run
12-
os.Unsetenv("SYSTEM_PULLREQUEST_SOURCEBRANCH")
13-
os.Unsetenv("BUILD_SOURCEBRANCHNAME")
14-
os.Unsetenv("BUILD_SOURCEBRANCH")
12+
os.Unsetenv("GITHUB_HEAD_REF")
13+
os.Unsetenv("GITHUB_REF_NAME")
14+
os.Unsetenv("GITHUB_REF")
1515

1616
t.Run("origin/main", func(t *testing.T) {
1717
refs := []string{
@@ -36,8 +36,8 @@ func TestPickBranchName(t *testing.T) {
3636
})
3737

3838
t.Run("pull request", func(t *testing.T) {
39-
os.Setenv("SYSTEM_PULLREQUEST_SOURCEBRANCH", "patch-1")
40-
defer os.Unsetenv("SYSTEM_PULLREQUEST_SOURCEBRANCH")
39+
os.Setenv("GITHUB_HEAD_REF", "patch-1")
40+
defer os.Unsetenv("GITHUB_HEAD_REF")
4141

4242
refs := []string{
4343
"refs/remotes/origin/foo",
@@ -48,10 +48,10 @@ func TestPickBranchName(t *testing.T) {
4848
})
4949

5050
t.Run("branch build", func(t *testing.T) {
51-
os.Setenv("BUILD_SOURCEBRANCHNAME", "foo")
52-
os.Setenv("BUILD_SOURCEBRANCH", "refs/heads/foo")
53-
defer os.Unsetenv("BUILD_SOURCEBRANCHNAME")
54-
defer os.Unsetenv("BUILD_SOURCEBRANCH")
51+
os.Setenv("GITHUB_REF_NAME", "foo")
52+
os.Setenv("GITHUB_REF", "refs/heads/foo")
53+
defer os.Unsetenv("GITHUB_REF_NAME")
54+
defer os.Unsetenv("GITHUB_REF")
5555

5656
refs := []string{
5757
"refs/remotes/origin/foo",
@@ -62,10 +62,10 @@ func TestPickBranchName(t *testing.T) {
6262
})
6363

6464
t.Run("tagged release on v1", func(t *testing.T) {
65-
os.Setenv("BUILD_SOURCEBRANCHNAME", "v1.0.0-alpha.1")
66-
os.Setenv("BUILD_SOURCEBRANCH", "refs/tags/v1.0.0-alpha.1")
67-
defer os.Unsetenv("BUILD_SOURCEBRANCHNAME")
68-
defer os.Unsetenv("BUILD_SOURCEBRANCH")
65+
os.Setenv("GITHUB_REF_NAME", "v1.0.0-alpha.1")
66+
os.Setenv("GITHUB_REF", "refs/tags/v1.0.0-alpha.1")
67+
defer os.Unsetenv("GITHUB_REF_NAME")
68+
defer os.Unsetenv("GITHUB_REF")
6969

7070
refs := []string{
7171
"refs/heads/release/v1",
@@ -77,10 +77,10 @@ func TestPickBranchName(t *testing.T) {
7777
})
7878

7979
t.Run("tagged release on main", func(t *testing.T) {
80-
os.Setenv("BUILD_SOURCEBRANCHNAME", "v0.38.3")
81-
os.Setenv("BUILD_SOURCEBRANCH", "refs/tags/v0.38.3")
82-
defer os.Unsetenv("BUILD_SOURCEBRANCHNAME")
83-
defer os.Unsetenv("BUILD_SOURCEBRANCH")
80+
os.Setenv("GITHUB_REF_NAME", "v0.38.3")
81+
os.Setenv("GITHUB_REF", "refs/tags/v0.38.3")
82+
defer os.Unsetenv("GITHUB_REF_NAME")
83+
defer os.Unsetenv("GITHUB_REF")
8484

8585
refs := []string{
8686
"refs/heads/release/v1",

0 commit comments

Comments
 (0)