File tree 1 file changed +21
-2
lines changed
1 file changed +21
-2
lines changed Original file line number Diff line number Diff line change @@ -57,13 +57,32 @@ pub async fn unroll_rollup(
57
57
let head = format_commit ( & c. rolled_up_head , true ) ;
58
58
format ! ( "❌ conflicts merging '{head}' into previous master ❌" )
59
59
} ) ;
60
- writeln ! ( & mut string, "|#{pr}|{commit}|" , pr = c. original_pr_number) . unwrap ( ) ;
60
+ let message = c
61
+ . rollup_merge
62
+ . message
63
+ . split ( '\n' )
64
+ // Skip over "Rollup merge of ..." and an empty line
65
+ . nth ( 2 )
66
+ . map ( |m| {
67
+ if m. len ( ) <= 60 {
68
+ m. to_string ( )
69
+ } else {
70
+ format ! ( "{}…" , m. split_at( 59 ) . 0 )
71
+ }
72
+ } )
73
+ . unwrap_or_else ( || format ! ( "#{}" , c. original_pr_number) ) ;
74
+ writeln ! (
75
+ & mut string,
76
+ "|#{pr}|{message}|{commit}|" ,
77
+ pr = c. original_pr_number
78
+ )
79
+ . unwrap ( ) ;
61
80
string
62
81
} ) ;
63
82
let previous_master = format_commit ( previous_master, true ) ;
64
83
let msg =
65
84
format ! ( "📌 Perf builds for each rolled up PR:\n \n \
66
- |PR# | Perf Build Sha|\n |----|:-----:|\n \
85
+ |PR# | Message | Perf Build Sha|\n |----|:-----:|\n \
67
86
{mapping}\n \n *previous master*: {previous_master}\n \n In the case of a perf regression, \
68
87
run the following command for each PR you suspect might be the cause: `@rust-timer build $SHA`\n \
69
88
{COMMENT_MARK_ROLLUP}") ;
You can’t perform that action at this time.
0 commit comments