@@ -22,16 +22,24 @@ const getDefaultBaseReleaseTag = async () => {
22
22
( async function ( ) {
23
23
try {
24
24
const token = core . getInput ( 'token' ) ;
25
- octokit = github . getOctokit ( token ) ;
25
+ const continueOnError = core . getInput ( 'continue-on-error' ) === 'true' ;
26
+
27
+ const octokit = github . getOctokit ( token ) ;
26
28
console . log ( "Initiated octokit" ) ;
27
29
28
- const headReleaseTag = await getHeadReleaseTag ( )
29
- console . log ( "Head release tag: " , headReleaseTag ) ;
30
+ let baseReleaseTag , headReleaseTag ;
31
+ if ( context . payload . pull_request ) {
32
+ baseReleaseTag = context . payload . pull_request . base . sha ;
33
+ headReleaseTag = context . payload . pull_request . head . sha ;
34
+ console . log ( "Running on Pull Request" ) ;
35
+ } else {
36
+ headReleaseTag = await getHeadReleaseTag ( ) ;
37
+ baseReleaseTag = core . getInput ( 'release-tag' ) || await getDefaultBaseReleaseTag ( ) ;
38
+ console . log ( "Running on Release" ) ;
39
+ }
30
40
31
- const baseReleaseTag = core . getInput ( 'release-tag' ) || await getDefaultBaseReleaseTag ( ) ;
32
41
console . log ( "Base release tag: " , baseReleaseTag ) ;
33
-
34
- const continueOnError = core . getInput ( 'continue-on-error' ) ;
42
+ console . log ( "Head release tag: " , headReleaseTag ) ;
35
43
36
44
const response = await octokit . rest . repos . compareCommitsWithBasehead ( {
37
45
owner : context . repo . owner ,
@@ -49,10 +57,10 @@ const getDefaultBaseReleaseTag = async () => {
49
57
}
50
58
core . setOutput ( 'issue-keys' , issueKeys . join ( ',' ) ) ;
51
59
} catch ( error ) {
52
- if ( ! continueOnerror ) {
60
+ if ( ! continueOnError ) {
53
61
core . setFailed ( error . message ) ;
54
62
} else {
55
63
core . setOutput ( 'issue-keys' , '' ) ;
56
64
}
57
65
}
58
- } ) ( )
66
+ } ) ( ) ;
0 commit comments