Skip to content

Commit 19055e2

Browse files
Rollup merge of #145780 - Kobzol:change-id-warn, r=lqd
Do not warn about missing change ID in tarball builds Fixes: #145778 r? `@jieyouxu`
2 parents 619cd01 + ea07201 commit 19055e2

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/bootstrap/src/bin/main.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,16 @@ fn check_version(config: &Config) -> Option<String> {
198198
Some(ChangeId::Id(id)) if id == latest_change_id => return None,
199199
Some(ChangeId::Ignore) => return None,
200200
Some(ChangeId::Id(id)) => id,
201-
None => {
201+
// The warning is only useful for development, not release tarballs
202+
None if !config.rust_info.is_from_tarball() => {
202203
msg.push_str("WARNING: The `change-id` is missing in the `bootstrap.toml`. This means that you will not be able to track the major changes made to the bootstrap configurations.\n");
203204
msg.push_str("NOTE: to silence this warning, ");
204205
msg.push_str(&format!(
205206
"add `change-id = {latest_change_id}` or `change-id = \"ignore\"` at the top of `bootstrap.toml`"
206207
));
207208
return Some(msg);
208209
}
210+
None => return None,
209211
};
210212

211213
// Always try to use `change-id` from .last-warned-change-id first. If it doesn't exist,

0 commit comments

Comments
 (0)