Skip to content

Commit 7da4f99

Browse files
committed
Remove AutoBuild labels
1 parent 4656d6b commit 7da4f99

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

src/bors/handlers/workflow.rs

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -193,19 +193,14 @@ async fn try_complete_build(
193193
return Ok(());
194194
}
195195

196-
let branch = payload.branch.as_str();
197-
let (status, trigger) = match (branch, has_failure) {
198-
(TRY_BRANCH_NAME, true) => (BuildStatus::Failure, LabelTrigger::TryBuildFailed),
199-
(TRY_BRANCH_NAME, false) => (BuildStatus::Success, LabelTrigger::TryBuildSucceeded),
200-
(AUTO_BRANCH_NAME, true) => (BuildStatus::Failure, LabelTrigger::AutoBuildFailed),
201-
(AUTO_BRANCH_NAME, false) => (BuildStatus::Success, LabelTrigger::AutoBuildSucceeded),
202-
_ => unreachable!(),
196+
let status = if !has_failure {
197+
BuildStatus::Success
198+
} else {
199+
BuildStatus::Failure
203200
};
204-
205201
db.update_build_status(&build, status).await?;
206-
handle_label_trigger(repo, pr.number, trigger).await?;
207202

208-
match branch {
203+
match payload.branch.as_str() {
209204
TRY_BRANCH_NAME => {
210205
complete_try_build(repo, pr, build, workflows, has_failure, payload).await?
211206
}
@@ -227,13 +222,21 @@ async fn complete_try_build(
227222
has_failure: bool,
228223
payload: CheckSuiteCompleted,
229224
) -> anyhow::Result<()> {
230-
let message = if !has_failure {
225+
let (trigger, message) = if !has_failure {
231226
tracing::info!("Workflow succeeded");
232-
try_build_succeeded_comment(&workflows, payload.commit_sha, &build)
227+
(
228+
LabelTrigger::TryBuildSucceeded,
229+
try_build_succeeded_comment(&workflows, payload.commit_sha, &build),
230+
)
233231
} else {
234232
tracing::info!("Workflow failed");
235-
workflow_failed_comment(&workflows)
233+
(
234+
LabelTrigger::TryBuildFailed,
235+
workflow_failed_comment(&workflows),
236+
)
236237
};
238+
239+
handle_label_trigger(repo, pr.number, trigger).await?;
237240
repo.client.post_comment(pr.number, message).await?;
238241

239242
Ok(())

src/bors/merge_queue.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,6 @@ async fn start_auto_build(
222222
let comment = auto_build_started_comment(&gh_pr.head.sha, &merge_sha);
223223
client.post_comment(pr.number, comment).await?;
224224

225-
// 6. Update label
226-
handle_label_trigger(repo, pr.number, LabelTrigger::AutoBuildSucceeded).await?;
227-
228225
Ok(true)
229226
}
230227
MergeResult::Conflict => {

src/github/labels.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ pub enum LabelTrigger {
66
TryBuildStarted,
77
TryBuildSucceeded,
88
TryBuildFailed,
9-
AutoBuildSucceeded,
10-
AutoBuildFailed,
119
Conflict,
1210
}
1311

0 commit comments

Comments
 (0)