mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure nightly branch name in stage0.json

Browse Source
This commit is contained in:
Pietro Albini 2022-07-11 10:15:13 +02:00
parent b6df2a70f0
commit 6bc97d0adc
No known key found for this signature in database
GPG Key ID: CD76B35F7734769E
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bootstrap/config.rs
View File

@ -226,6 +226,7 @@ pub struct Stage0Config {
pub artifacts_server: String, pub artifacts_server: String,
pub artifacts_with_llvm_assertions_server: String, pub artifacts_with_llvm_assertions_server: String,
pub git_merge_commit_email: String, pub git_merge_commit_email: String,
pub nightly_branch: String,
} }
#[derive(Default, Deserialize)] #[derive(Default, Deserialize)]
#[cfg_attr(test, derive(Clone))] #[cfg_attr(test, derive(Clone))]

13
src/bootstrap/lib.rs
View File

@ -1280,14 +1280,11 @@ impl Build {
// Figure out how many merge commits happened since we branched off master. // Figure out how many merge commits happened since we branched off master.
// That's our beta number! // That's our beta number!
// (Note that we use a `..` range, not the `...` symmetric difference.) // (Note that we use a `..` range, not the `...` symmetric difference.)
let count = output( let count =
self.config output(self.config.git().arg("rev-list").arg("--count").arg("--merges").arg(format!(
.git() "refs/remotes/origin/{}..HEAD",
.arg("rev-list") self.config.stage0_metadata.config.nightly_branch
.arg("--count") )));
.arg("--merges")
.arg("refs/remotes/origin/master..HEAD"),
);
let n = count.trim().parse().unwrap(); let n = count.trim().parse().unwrap();
self.prerelease_version.set(Some(n)); self.prerelease_version.set(Some(n));
n n

3
src/stage0.json
View File

@ -3,7 +3,8 @@
"dist_server": "https://static.rust-lang.org", "dist_server": "https://static.rust-lang.org",
"artifacts_server": "https://ci-artifacts.rust-lang.org/rustc-builds", "artifacts_server": "https://ci-artifacts.rust-lang.org/rustc-builds",
"artifacts_with_llvm_assertions_server": "https://ci-artifacts.rust-lang.org/rustc-builds-alt", "artifacts_with_llvm_assertions_server": "https://ci-artifacts.rust-lang.org/rustc-builds-alt",
"git_merge_commit_email": "bors@rust-lang.org" "git_merge_commit_email": "bors@rust-lang.org",
"nightly_branch": "master"
}, },
"__comments": [ "__comments": [
"The configuration above this comment is editable, and can be changed", "The configuration above this comment is editable, and can be changed",