@@ -8,6 +8,7 @@ use crate::bors::Comment;
8
8
use crate :: bors:: RepositoryState ;
9
9
use crate :: database:: RunId ;
10
10
use crate :: database:: { BuildModel , BuildStatus , PullRequestModel , WorkflowStatus , WorkflowType } ;
11
+ use crate :: github:: GithubRepoName ;
11
12
use crate :: github:: {
12
13
CommitSha , GithubUser , LabelTrigger , MergeError , PullRequest , PullRequestNumber ,
13
14
} ;
@@ -93,7 +94,7 @@ pub(super) async fn command_try_build(
93
94
. merge_branches (
94
95
TRY_MERGE_BRANCH_NAME ,
95
96
& pr. head . sha ,
96
- & auto_merge_commit_message ( pr, "<try>" , jobs) ,
97
+ & auto_merge_commit_message ( pr, repo . client . repository ( ) , "<try>" , jobs) ,
97
98
)
98
99
. await
99
100
{
@@ -231,16 +232,23 @@ fn get_pending_build(pr: PullRequestModel) -> Option<BuildModel> {
231
232
. and_then ( |b| ( b. status == BuildStatus :: Pending ) . then_some ( b) )
232
233
}
233
234
234
- fn auto_merge_commit_message ( pr : & PullRequest , reviewer : & str , jobs : Vec < String > ) -> String {
235
+ fn auto_merge_commit_message (
236
+ pr : & PullRequest ,
237
+ name : & GithubRepoName ,
238
+ reviewer : & str ,
239
+ jobs : Vec < String > ,
240
+ ) -> String {
235
241
let pr_number = pr. number ;
236
242
let mut message = format ! (
237
- r#"Auto merge of #{pr_number} - {pr_label}, r={reviewer}
243
+ r#"Auto merge of {repo_owner}/{repo_name} #{pr_number} - {pr_label}, r={reviewer}
238
244
{pr_title}
239
245
240
246
{pr_message}"# ,
241
247
pr_label = pr. head_label,
242
248
pr_title = pr. title,
243
- pr_message = pr. message
249
+ pr_message = pr. message,
250
+ repo_owner = name. owner( ) ,
251
+ repo_name = name. name( )
244
252
) ;
245
253
246
254
// if jobs is empty, try-job won't be added to the message
0 commit comments