diff options
| author | Pietro Albini <pietro.albini@ferrous-systems.com> | 2022-07-11 10:15:13 +0200 |
|---|---|---|
| committer | Pietro Albini <pietro.albini@ferrous-systems.com> | 2022-07-11 10:15:13 +0200 |
| commit | 6bc97d0adcc7e9bd828de1ccf9c9ffc9b30165ee (patch) | |
| tree | 763d9d417ab5f65884c5b24a4b01c8a27f27f47f | |
| parent | b6df2a70f0ef9013bbbbfca342c29d165ea467fa (diff) | |
| download | rust-6bc97d0adcc7e9bd828de1ccf9c9ffc9b30165ee.tar.gz rust-6bc97d0adcc7e9bd828de1ccf9c9ffc9b30165ee.zip | |
configure nightly branch name in stage0.json
| -rw-r--r-- | src/bootstrap/config.rs | 1 | ||||
| -rw-r--r-- | src/bootstrap/lib.rs | 13 | ||||
| -rw-r--r-- | src/stage0.json | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs index 39d86ccbdbf..62dd9a6b365 100644 --- a/src/bootstrap/config.rs +++ b/src/bootstrap/config.rs @@ -226,6 +226,7 @@ pub struct Stage0Config { pub artifacts_server: String, pub artifacts_with_llvm_assertions_server: String, pub git_merge_commit_email: String, + pub nightly_branch: String, } #[derive(Default, Deserialize)] #[cfg_attr(test, derive(Clone))] diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index c1190c9192d..cd421c249d8 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -1280,14 +1280,11 @@ impl Build { // Figure out how many merge commits happened since we branched off master. // That's our beta number! // (Note that we use a `..` range, not the `...` symmetric difference.) - let count = output( - self.config - .git() - .arg("rev-list") - .arg("--count") - .arg("--merges") - .arg("refs/remotes/origin/master..HEAD"), - ); + let count = + output(self.config.git().arg("rev-list").arg("--count").arg("--merges").arg(format!( + "refs/remotes/origin/{}..HEAD", + self.config.stage0_metadata.config.nightly_branch + ))); let n = count.trim().parse().unwrap(); self.prerelease_version.set(Some(n)); n diff --git a/src/stage0.json b/src/stage0.json index 64b8aca3960..ab8a79e2af5 100644 --- a/src/stage0.json +++ b/src/stage0.json @@ -3,7 +3,8 @@ "dist_server": "https://static.rust-lang.org", "artifacts_server": "https://ci-artifacts.rust-lang.org/rustc-builds", "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": [ "The configuration above this comment is editable, and can be changed", |