Skip to content

Handle temporary new bors e-mail#410

Merged
Mark-Simulacrum merged 1 commit intorust-lang:masterfrom
Kobzol:generalize-bors-author
Jan 25, 2026
Merged

Handle temporary new bors e-mail#410
Mark-Simulacrum merged 1 commit intorust-lang:masterfrom
Kobzol:generalize-bors-author

Conversation

@Kobzol
Copy link
Member

@Kobzol Kobzol commented Jan 14, 2026

New bors was using this username for ~5 days between 7. 1. and 12. 1. 2026.

@zachs18
Copy link

zachs18 commented Jan 25, 2026

I tried using cargo-bisect-rustc built with this PR to bisect rust-lang/rust#151625 and got the same error as in the crates.io 0.6.11 release that someone else also got: rust-lang/rust#151625 (comment) when bisecting encounters a commit from 2026-01-08 (rust-lang/rust@31cd367)

ERROR: Expected author GitHub to be bors for 31cd367b9ca1ce359268e7adf4ea540408c0ad85.
Make sure specified commits are on the default branch and refer to a bors merge commit!

diff --git a/src/main.rs b/src/main.rs
index 6a21440..54d8901 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -37,7 +37,7 @@ use crate::toolchains::{
 };
 
 /// Git usernames used by bors.
-const BORS_AUTHORS: &[&str] = &["bors", "rust-bors[bot]"];
+const BORS_AUTHORS: &[&str] = &["bors", "rust-bors[bot]", "GitHub"];
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct Commit {

This patch makes the bisection work, though I'm not sure why the code thinks 31cd367b9ca1ce359268e7adf4ea540408c0ad85 was commited by GitHub, if you look at it on the web UI it says rust-bors[bot], and in git show it says Author: bors <bors@rust-lang.org>

@Kobzol
Copy link
Member Author

Kobzol commented Jan 25, 2026

There is a ~5 days of commits that were authored by the new bors e-mail, but committed by GitHub (that's how it works by default in the GitHub API, before I switched to the old bors e-mail). I'll take a look, thanks.

@Kobzol Kobzol force-pushed the generalize-bors-author branch from c14e2d2 to 6727c66 Compare January 25, 2026 11:59
@Kobzol
Copy link
Member Author

Kobzol commented Jan 25, 2026

Pushed a fix that should resolve the issue, we now check the commit author, instead of the committer. Was able to bisect rust-lang/rust#151625 to 7dcb568a5ab87f090341fed0ad6ce6482c4e6b1d with the fix.

@Mark-Simulacrum
Copy link
Member

The changes look reasonable (and it sounds like we manually tested). I'm not sure how the release infra works for cargo-bisect-rustc, looks like maybe trusted publishing?

@Mark-Simulacrum Mark-Simulacrum merged commit 995147f into rust-lang:master Jan 25, 2026
4 checks passed
@Kobzol Kobzol deleted the generalize-bors-author branch January 25, 2026 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants