Merge pull request #18405 from lnicola/fix-changelog
internal: Update changelog generation for merge queues
diff --git a/xtask/src/release/changelog.rs b/xtask/src/release/changelog.rs
index 086a4d4..343a9ef 100644
--- a/xtask/src/release/changelog.rs
+++ b/xtask/src/release/changelog.rs
@@ -128,9 +128,10 @@
}
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 #";
- 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()
} else if let Some(s) = s.strip_prefix(HOMU_PREFIX) {
if let Some(space) = s.find(' ') {
