mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #130356 - lolbinarycat:ci-no-change-id, r=albertlarsan68

Browse source 
don't warn about a missing change-id in CI

fixes #130352
This commit is contained in:
Matthias Krüger 2024-10-13 18:27:19 +02:00 • committed by GitHub
commit 1d0c7cf49f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/bootstrap/src/bin/main.rs
View file

@ -14,6 +14,7 @@ use bootstrap::{
Build, CONFIG_CHANGE_HISTORY, Config, Flags, Subcommand, find_recent_config_change_ids,
human_readable_changes, t,
};
use build_helper::ci::CiEnv;
fn main() {
let args = env::args().skip(1).collect::<Vec<_>>();
@ -54,9 +55,12 @@ fn main() {
};
}
// check_version warnings are not printed during setup
let changelog_suggestion =
if matches!(config.cmd, Subcommand::Setup { .. }) { None } else { check_version(&config) };
// check_version warnings are not printed during setup, or during CI
let changelog_suggestion = if matches!(config.cmd, Subcommand::Setup { .. }) || CiEnv::is_ci() {
None
} else {
check_version(&config)
};
// NOTE: Since `./configure` generates a `config.toml`, distro maintainers will see the
// changelog warning, not the `x.py setup` message.