nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-10 14:57:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

[beta] Attempt to fix prerelease version calculation

Browse Source 
We got #47396 merged but it looks like rcs failed to deploy the beta because
when it tried to calculate the beta version its cwd was different. Let's try to
fix this bug and fix auto-deploy by explicitly setting the `current_dir` for git
commands.
This commit is contained in:
Alex Crichton 2018-01-18 07:14:12 -08:00
parent 334ef6246d
commit cbfb985895
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bootstrap/lib.rs
View File

@ -787,6 +787,7 @@ impl Build {
.arg("ls-remote")
.arg("origin")
.arg("beta")
.current_dir(&self.src)
);
let beta = beta.trim().split_whitespace().next().unwrap();
let master = output(
@ -794,6 +795,7 @@ impl Build {
.arg("ls-remote")
.arg("origin")
.arg("master")
.current_dir(&self.src)
);
let master = master.trim().split_whitespace().next().unwrap();
@ -802,7 +804,8 @@ impl Build {
Command::new("git")
.arg("merge-base")
.arg(beta)
.arg(master),
.arg(master)
.current_dir(&self.src),
);
let base = base.trim();
@ -813,7 +816,8 @@ impl Build {
.arg("rev-list")
.arg("--count")
.arg("--merges")
.arg(format!("{}...HEAD", base)),
.arg(format!("{}...HEAD", base))
.current_dir(&self.src),
);
let n = count.trim().parse().unwrap();
self.prerelease_version.set(Some(n));