Skip to content

Commit

Permalink
remove the need to update bump-stage0 with new stage0 config fields
Browse files Browse the repository at this point in the history
  • Loading branch information
pietroalbini committed Jul 11, 2022
1 parent a51fb2b commit b6df2a7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/tools/bump-stage0/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
9 changes: 6 additions & 3 deletions src/tools/bump-stage0/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down

0 comments on commit b6df2a7

Please sign in to comment.