@@ -57,14 +57,16 @@ if (ci) {
57
57
} ) ;
58
58
59
59
test ( "pull_request_number is set" , t => {
60
- let circlePullRequestNumber ;
60
+ let pullRequestNumber ;
61
61
if ( process . env . CI_PULL_REQUEST )
62
- circlePullRequestNumber = process . env . CI_PULL_REQUEST . split ( "/" ) . pop ( ) ;
63
-
62
+ pullRequestNumber = process . env . CI_PULL_REQUEST . split ( "/" ) . pop ( ) ;
63
+ if ( process . env . GITHUB_ACTION )
64
+ pullRequestNumber = process . env . GITHUB_REF . split ( '/' ) [ 2 ] ;
65
+
64
66
const real_pull_request_number =
65
67
process . env . TRAVIS_PULL_REQUEST ||
66
68
process . env . DRONE_PULL_REQUEST ||
67
- circlePullRequestNumber ||
69
+ pullRequestNumber ||
68
70
"" ; // wercker does not expose pull request number
69
71
70
72
t . is ( pull_request_number , real_pull_request_number ) ;
@@ -102,7 +104,7 @@ if (ci) {
102
104
if ( event === "pull_request" )
103
105
t . is (
104
106
branch ,
105
- process . env . TRAVIS_PULL_REQUEST_BRANCH || process . env . GITHUB_REF
107
+ process . env . TRAVIS_PULL_REQUEST_BRANCH || process . env . GITHUB_HEAD_REF
106
108
) ;
107
109
else {
108
110
const real_branch =
@@ -111,7 +113,7 @@ if (ci) {
111
113
process . env . WERCKER_GIT_BRANCH ||
112
114
process . env . DRONE_BRANCH ||
113
115
process . env . CI_BRANCH || // codeship
114
- process . env . GITHUB_REF ;
116
+ process . env . GITHUB_REF . split ( '/' ) [ 2 ] ;
115
117
116
118
t . is ( branch , real_branch ) ;
117
119
}
0 commit comments