remove the need to update bump-stage0 with new stage0 config fields
This commit is contained in:
parent
a51fb2ba82
commit
b6df2a70f0
2 changed files with 7 additions and 4 deletions
|
@ -10,5 +10,5 @@ anyhow = "1.0.34"
|
|||
curl = "0.4.38"
|
||||
indexmap = { version = "1.7.0", features = ["serde"] }
|
||||
serde = { version = "1.0.125", features = ["derive"] }
|
||||
serde_json = "1.0.59"
|
||||
serde_json = { version = "1.0.59", features = ["preserve_order"] }
|
||||
toml = "0.5.7"
|
||||
|
|
|
@ -198,9 +198,12 @@ struct Stage0 {
|
|||
#[derive(Debug, serde::Serialize, serde::Deserialize)]
|
||||
struct Config {
|
||||
dist_server: String,
|
||||
artifacts_server: String,
|
||||
artifacts_with_llvm_assertions_server: String,
|
||||
git_merge_commit_email: String,
|
||||
// There are other fields in the configuration, which will be read by src/bootstrap or other
|
||||
// tools consuming stage0.json. To avoid the need to update bump-stage0 every time a new field
|
||||
// is added, we collect all the fields in an untyped Value and serialize them back with the
|
||||
// same order and structure they were deserialized in.
|
||||
#[serde(flatten)]
|
||||
other: serde_json::Value,
|
||||
}
|
||||
|
||||
#[derive(Debug, serde::Serialize, serde::Deserialize)]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue