Skip to content

Commit db75a25

Browse files
fix: use base instead of head for base changed notification
1 parent 08378e2 commit db75a25

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

src/bors/handlers/review.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use crate::bors::event::PullRequestEdited;
55
use crate::bors::handlers::labels::handle_label_trigger;
66
use crate::bors::Comment;
77
use crate::bors::RepositoryState;
8-
use crate::github::CommitSha;
98
use crate::github::GithubUser;
109
use crate::github::LabelTrigger;
1110
use crate::github::PullRequest;
@@ -75,7 +74,7 @@ pub(super) async fn handle_pull_request_edited(
7574
let pr_number = payload.pull_request.number;
7675
db.unapprove(repo_state.repository(), pr_number).await?;
7776
handle_label_trigger(&repo_state, pr_number, LabelTrigger::Unapproved).await?;
78-
notify_of_edited_pr(&repo_state, pr_number, payload.pull_request.head.sha).await
77+
notify_of_edited_pr(&repo_state, pr_number, &payload.pull_request.base.name).await
7978
}
8079

8180
fn sufficient_approve_permission(repo: Arc<RepositoryState>, author: &GithubUser) -> bool {
@@ -164,15 +163,15 @@ async fn notify_of_unapproval(repo: &RepositoryState, pr: &PullRequest) -> anyho
164163
async fn notify_of_edited_pr(
165164
repo: &RepositoryState,
166165
pr_number: PullRequestNumber,
167-
head_sha: CommitSha,
166+
base_name: &str,
168167
) -> anyhow::Result<()> {
169168
repo.client
170169
.post_comment(
171170
pr_number,
172171
Comment::new(format!(
173172
r#":warning: The base branch changed to `{}`, and the
174173
PR will need to be re-approved."#,
175-
head_sha
174+
base_name
176175
)),
177176
)
178177
.await
@@ -339,11 +338,8 @@ approve = ["+approved"]
339338

340339
assert_eq!(
341340
tester.get_comment().await?,
342-
format!(
343-
r#":warning: The base branch changed to `pr-{}-sha`, and the
341+
r#":warning: The base branch changed to `main`, and the
344342
PR will need to be re-approved."#,
345-
default_pr_number()
346-
)
347343
);
348344
check_pr_unapproved(&tester, default_pr_number().into()).await;
349345
Ok(tester)

0 commit comments

Comments
 (0)