Skip to content

Commit

Permalink
Rollup merge of #130356 - lolbinarycat:ci-no-change-id, r=albertlarsan68
Browse files Browse the repository at this point in the history
don't warn about a missing change-id in CI

fixes #130352
  • Loading branch information
matthiaskrgr authored Oct 13, 2024
2 parents 2aa26d8 + 32f01b2 commit 1d0c7cf
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/bootstrap/src/bin/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<_>>();
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 1d0c7cf

Please sign in to comment.