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