Skip to content

Commit 9a24d8a

Browse files
authored
Rollup merge of rust-lang#119080 - onur-ozkan:comment-change-id-in-example-config, r=Kobzol
Comment out `change-id` in `config.example.toml` This way, we only update CONFIG_CHANGE_HISTORY for major changes, which is much simpler (and updating example.toml doesn't make much sense) r? `@Kobzol` (as this was mainly your idea)
2 parents e8046d3 + ce2eaa6 commit 9a24d8a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

config.example.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
# - A change in the default values
3030
#
3131
# If `change-id` does not match the version that is currently running,
32-
# `x.py` will prompt you to update it and check the related PR for more details.
33-
change-id = 118703
32+
# `x.py` will inform you about the changes made on bootstrap.
33+
# change-id = <latest change id in src/bootstrap/src/utils/change_tracker.rs>
3434

3535
# =============================================================================
3636
# Tweaking how LLVM is compiled

triagebot.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -605,19 +605,19 @@ cc = ["@davidtwco", "@wesleywiser"]
605605
message = """
606606
This PR modifies `src/bootstrap/src/core/config`.
607607
608-
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs` and `change-id` in `config.example.toml`.
608+
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs`.
609609
"""
610610
[mentions."src/bootstrap/defaults"]
611611
message = """
612612
This PR modifies `src/bootstrap/defaults`.
613613
614-
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs` and `change-id` in `config.example.toml`.
614+
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs`.
615615
"""
616616
[mentions."config.example.toml"]
617617
message = """
618618
This PR modifies `config.example.toml`.
619619
620-
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs` and `change-id` in `config.example.toml`.
620+
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs`.
621621
"""
622622

623623
[mentions."src/bootstrap/defaults/config.compiler.toml"]

0 commit comments

Comments
 (0)