Merge pull request #18405 from lnicola/fix-changelog

internal: Update changelog generation for merge queues
This commit is contained in:
Laurențiu Nicola 2024-10-24 17:54:25 +00:00 committed by GitHub
commit 6a67a4d3cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -128,9 +128,10 @@ fn unescape(s: &str) -> String {
} }
fn parse_pr_number(s: &str) -> Option<u32> { fn parse_pr_number(s: &str) -> Option<u32> {
const BORS_PREFIX: &str = "Merge #"; const GITHUB_PREFIX: &str = "Merge pull request #";
const HOMU_PREFIX: &str = "Auto merge of #"; const HOMU_PREFIX: &str = "Auto merge of #";
if let Some(s) = s.strip_prefix(BORS_PREFIX) { if let Some(s) = s.strip_prefix(GITHUB_PREFIX) {
let s = if let Some(space) = s.find(' ') { &s[..space] } else { s };
s.parse().ok() s.parse().ok()
} else if let Some(s) = s.strip_prefix(HOMU_PREFIX) { } else if let Some(s) = s.strip_prefix(HOMU_PREFIX) {
if let Some(space) = s.find(' ') { if let Some(space) = s.find(' ') {