bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove the need to update bump-stage0 with new stage0 config fields

Browse source
This commit is contained in:
Pietro Albini 2022-06-30 09:54:51 +02:00
parent a51fb2ba82
commit b6df2a70f0
No known key found for this signature in database
GPG key ID: CD76B35F7734769E
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/bump-stage0/Cargo.toml
View file

@ -10,5 +10,5 @@ anyhow = "1.0.34"
curl = "0.4.38" curl = "0.4.38"
indexmap = { version = "1.7.0", features = ["serde"] } indexmap = { version = "1.7.0", features = ["serde"] }
serde = { version = "1.0.125", features = ["derive"] } 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" toml = "0.5.7"

9
src/tools/bump-stage0/src/main.rs
View file

@ -198,9 +198,12 @@ struct Stage0 {
#[derive(Debug, serde::Serialize, serde::Deserialize)] #[derive(Debug, serde::Serialize, serde::Deserialize)]
struct Config { struct Config {
dist_server: String, dist_server: String,
artifacts_server: String, // There are other fields in the configuration, which will be read by src/bootstrap or other
artifacts_with_llvm_assertions_server: String, // tools consuming stage0.json. To avoid the need to update bump-stage0 every time a new field
git_merge_commit_email: String, // 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)] #[derive(Debug, serde::Serialize, serde::Deserialize)]