From 62d484be34ac33ddbb1f78c75ca8b6b914ca5cf1 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Sat, 14 Sep 2024 22:42:47 +0300 Subject: [PATCH 1/5] print missing change-tracker option only in verbose mode Signed-off-by: onur-ozkan --- src/bootstrap/src/bin/main.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bootstrap/src/bin/main.rs b/src/bootstrap/src/bin/main.rs index b9df7336cca0b..700b9b0cb159e 100644 --- a/src/bootstrap/src/bin/main.rs +++ b/src/bootstrap/src/bin/main.rs @@ -171,11 +171,14 @@ fn check_version(config: &Config) -> Option { if io::stdout().is_terminal() && !config.dry_run() { t!(fs::write(warned_id_path, latest_change_id.to_string())); } - } else { + + Some(msg) + } else if config.is_verbose() { msg.push_str("WARNING: The `change-id` is missing in the `config.toml`. This means that you will not be able to track the major changes made to the bootstrap configurations.\n"); msg.push_str("NOTE: to silence this warning, "); msg.push_str(&format!("add `change-id = {latest_change_id}` at the top of `config.toml`")); - }; - - Some(msg) + Some(msg) + } else { + None + } } From 4d0b1d0cdf21debcdac07e57e45dfbe5ae2603ff Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Sat, 14 Sep 2024 22:51:45 +0300 Subject: [PATCH 2/5] do not set `change-tracker` option with `x setup` Signed-off-by: onur-ozkan --- src/bootstrap/src/core/build_steps/setup.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/setup.rs b/src/bootstrap/src/core/build_steps/setup.rs index f4c5fe5ff941c..5f57dc79eaaa1 100644 --- a/src/bootstrap/src/core/build_steps/setup.rs +++ b/src/bootstrap/src/core/build_steps/setup.rs @@ -16,7 +16,6 @@ use std::{fmt, fs, io}; use sha2::Digest; use crate::core::builder::{Builder, RunConfig, ShouldRun, Step}; -use crate::utils::change_tracker::CONFIG_CHANGE_HISTORY; use crate::utils::exec::command; use crate::utils::helpers::{self, hex_encode}; use crate::{Config, t}; @@ -228,11 +227,9 @@ fn setup_config_toml(path: &PathBuf, profile: Profile, config: &Config) { return; } - let latest_change_id = CONFIG_CHANGE_HISTORY.last().unwrap().change_id; let settings = format!( "# Includes one of the default files in {PROFILE_DIR}\n\ - profile = \"{profile}\"\n\ - change-id = {latest_change_id}\n" + profile = \"{profile}\"\n" ); t!(fs::write(path, settings)); From 449c844e6854de972013fac0e559c49439a51967 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Sat, 14 Sep 2024 22:52:11 +0300 Subject: [PATCH 3/5] update `change-id` default in `config.example.toml` Signed-off-by: onur-ozkan --- config.example.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.example.toml b/config.example.toml index 47ebb20d8fa82..ccc8c3298c2a0 100644 --- a/config.example.toml +++ b/config.example.toml @@ -30,7 +30,7 @@ # # If `change-id` does not match the version that is currently running, # `x.py` will inform you about the changes made on bootstrap. -#change-id = +#change-id = # ============================================================================= # Tweaking how LLVM is compiled From 6ad1c2bcdd08fe7b8089659105d69af1874308c8 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Sat, 14 Sep 2024 22:52:52 +0300 Subject: [PATCH 4/5] remove `change-id` from CI script Signed-off-by: onur-ozkan --- src/ci/run.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/ci/run.sh b/src/ci/run.sh index c8201d9bcfd27..a047c6667f8ec 100755 --- a/src/ci/run.sh +++ b/src/ci/run.sh @@ -47,11 +47,6 @@ source "$ci_dir/shared.sh" export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse -# suppress change-tracker warnings on CI -if [ "$CI" != "" ]; then - RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set change-id=99999999" -fi - if ! isCI || isCiBranch auto || isCiBranch beta || isCiBranch try || isCiBranch try-perf || \ isCiBranch automation/bors/try; then RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set build.print-step-timings --enable-verbose-tests" From 70216e637b2e195edc79a586ef8b3e125400b442 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Mon, 16 Sep 2024 08:07:50 +0300 Subject: [PATCH 5/5] remove change-id from cranelift script Signed-off-by: onur-ozkan --- compiler/rustc_codegen_cranelift/scripts/setup_rust_fork.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/compiler/rustc_codegen_cranelift/scripts/setup_rust_fork.sh b/compiler/rustc_codegen_cranelift/scripts/setup_rust_fork.sh index 2f13b0b9cb834..c84d70850ac7a 100644 --- a/compiler/rustc_codegen_cranelift/scripts/setup_rust_fork.sh +++ b/compiler/rustc_codegen_cranelift/scripts/setup_rust_fork.sh @@ -23,8 +23,6 @@ git -c user.name=Dummy -c user.email=dummy@example.com -c commit.gpgSign=false \ am ../patches/*-stdlib-*.patch cat > config.toml <