Skip to content

Commit 2430e3c

Browse files
authored
Merge pull request #166 from NULLx76/include_repo_name
Include repo name in merge commit
2 parents 2deb846 + cee021f commit 2430e3c

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

src/bors/handlers/trybuild.rs

+12-4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use crate::bors::Comment;
88
use crate::bors::RepositoryState;
99
use crate::database::RunId;
1010
use crate::database::{BuildModel, BuildStatus, PullRequestModel, WorkflowStatus, WorkflowType};
11+
use crate::github::GithubRepoName;
1112
use crate::github::{
1213
CommitSha, GithubUser, LabelTrigger, MergeError, PullRequest, PullRequestNumber,
1314
};
@@ -93,7 +94,7 @@ pub(super) async fn command_try_build(
9394
.merge_branches(
9495
TRY_MERGE_BRANCH_NAME,
9596
&pr.head.sha,
96-
&auto_merge_commit_message(pr, "<try>", jobs),
97+
&auto_merge_commit_message(pr, repo.client.repository(), "<try>", jobs),
9798
)
9899
.await
99100
{
@@ -231,16 +232,23 @@ fn get_pending_build(pr: PullRequestModel) -> Option<BuildModel> {
231232
.and_then(|b| (b.status == BuildStatus::Pending).then_some(b))
232233
}
233234

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 {
235241
let pr_number = pr.number;
236242
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}
238244
{pr_title}
239245
240246
{pr_message}"#,
241247
pr_label = pr.head_label,
242248
pr_title = pr.title,
243-
pr_message = pr.message
249+
pr_message = pr.message,
250+
repo_owner = name.owner(),
251+
repo_name = name.name()
244252
);
245253

246254
// if jobs is empty, try-job won't be added to the message

0 commit comments

Comments
 (0)