Skip to content

Commit 4e4c54e

Browse files
authored
Unrolled build for rust-lang#130356
Rollup merge of rust-lang#130356 - lolbinarycat:ci-no-change-id, r=albertlarsan68 don't warn about a missing change-id in CI fixes rust-lang#130352
2 parents 27861c4 + 32f01b2 commit 4e4c54e

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

src/bootstrap/src/bin/main.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ use bootstrap::{
1414
Build, CONFIG_CHANGE_HISTORY, Config, Flags, Subcommand, find_recent_config_change_ids,
1515
human_readable_changes, t,
1616
};
17+
use build_helper::ci::CiEnv;
1718

1819
fn main() {
1920
let args = env::args().skip(1).collect::<Vec<_>>();
@@ -54,9 +55,12 @@ fn main() {
5455
};
5556
}
5657

57-
// check_version warnings are not printed during setup
58-
let changelog_suggestion =
59-
if matches!(config.cmd, Subcommand::Setup { .. }) { None } else { check_version(&config) };
58+
// check_version warnings are not printed during setup, or during CI
59+
let changelog_suggestion = if matches!(config.cmd, Subcommand::Setup { .. }) || CiEnv::is_ci() {
60+
None
61+
} else {
62+
check_version(&config)
63+
};
6064

6165
// NOTE: Since `./configure` generates a `config.toml`, distro maintainers will see the
6266
// changelog warning, not the `x.py setup` message.

0 commit comments

Comments
 (0)