diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-12-18 17:03:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 17:03:12 +0100 |
| commit | 9a24d8a1015e2720af5bfdb5cacbe0685ed11466 (patch) | |
| tree | 4b26ebab220890505a5394164fc5b0a874cf6987 | |
| parent | e8046d3c14e919e04504ee21d1b5661c7b1a0335 (diff) | |
| parent | ce2eaa6325d9cc7e976be8f83097f07c5fb7941a (diff) | |
| download | rust-9a24d8a1015e2720af5bfdb5cacbe0685ed11466.tar.gz rust-9a24d8a1015e2720af5bfdb5cacbe0685ed11466.zip | |
Rollup merge of #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)
| -rw-r--r-- | config.example.toml | 4 | ||||
| -rw-r--r-- | triagebot.toml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/config.example.toml b/config.example.toml index 14e0b9d521f..a7d4df545a6 100644 --- a/config.example.toml +++ b/config.example.toml @@ -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 diff --git a/triagebot.toml b/triagebot.toml index 2867bbc8171..e4b104cdb86 100644 --- a/triagebot.toml +++ b/triagebot.toml @@ -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"] |