File tree Expand file tree Collapse file tree 2 files changed +13
-1
lines changed Expand file tree Collapse file tree 2 files changed +13
-1
lines changed Original file line number Diff line number Diff line change @@ -553,6 +553,7 @@ describe('input-helper tests', () => {
553
553
expect ( checkerArguments . pattern ) . toBe ( 'some-pattern' )
554
554
expect ( checkerArguments . error ) . toBe ( 'some-error' )
555
555
expect ( checkerArguments . messages ) . toBeTruthy ( )
556
+ expect ( checkerArguments . messages . length ) . toBe ( 1 )
556
557
expect ( checkerArguments . messages [ 0 ] ) . toBe ( 'some-message' )
557
558
} )
558
559
@@ -566,6 +567,12 @@ describe('input-helper tests', () => {
566
567
} ,
567
568
{
568
569
message : 'other-message'
570
+ } ,
571
+ {
572
+ message : 'ignored-message' ,
573
+ parents : {
574
+ totalCount : 2
575
+ }
569
576
}
570
577
]
571
578
}
@@ -577,6 +584,7 @@ describe('input-helper tests', () => {
577
584
expect ( checkerArguments . pattern ) . toBe ( 'some-pattern' )
578
585
expect ( checkerArguments . error ) . toBe ( 'some-error' )
579
586
expect ( checkerArguments . messages ) . toBeTruthy ( )
587
+ expect ( checkerArguments . messages . length ) . toBe ( 2 )
580
588
expect ( checkerArguments . messages [ 0 ] ) . toBe ( 'some-message' )
581
589
expect ( checkerArguments . messages [ 1 ] ) . toBe ( 'other-message' )
582
590
} )
Original file line number Diff line number Diff line change @@ -201,7 +201,11 @@ async function getMessages(
201
201
}
202
202
203
203
for ( const i in github . context . payload . commits ) {
204
- if ( github . context . payload . commits [ i ] . message ) {
204
+ if (
205
+ github . context . payload . commits [ i ] . message &&
206
+ // ignore merge commits
207
+ ( github . context . payload . commits [ i ] . parents . totalCount === 1 ?? true )
208
+ ) {
205
209
messages . push ( github . context . payload . commits [ i ] . message )
206
210
}
207
211
}
You can’t perform that action at this time.
0 commit comments