Skip to content

Commit

Permalink
Rollup merge of rust-lang#119080 - onur-ozkan:comment-change-id-in-ex…
Browse files Browse the repository at this point in the history
…ample-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)
  • Loading branch information
matthiaskrgr authored Dec 18, 2023
2 parents e8046d3 + ce2eaa6 commit 9a24d8a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions config.example.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
# - A change in the default values
#
# If `change-id` does not match the version that is currently running,
# `x.py` will prompt you to update it and check the related PR for more details.
change-id = 118703
# `x.py` will inform you about the changes made on bootstrap.
# change-id = <latest change id in src/bootstrap/src/utils/change_tracker.rs>

# =============================================================================
# Tweaking how LLVM is compiled
Expand Down
6 changes: 3 additions & 3 deletions triagebot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -605,19 +605,19 @@ cc = ["@davidtwco", "@wesleywiser"]
message = """
This PR modifies `src/bootstrap/src/core/config`.
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs` and `change-id` in `config.example.toml`.
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs`.
"""
[mentions."src/bootstrap/defaults"]
message = """
This PR modifies `src/bootstrap/defaults`.
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs` and `change-id` in `config.example.toml`.
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs`.
"""
[mentions."config.example.toml"]
message = """
This PR modifies `config.example.toml`.
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs` and `change-id` in `config.example.toml`.
If appropriate, please update `CONFIG_CHANGE_HISTORY` in `src/bootstrap/src/utils/change_tracker.rs`.
"""

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

0 comments on commit 9a24d8a

Please sign in to comment.