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

Auto merge of #77854 - pietroalbini:ETOOMANYCHANNELS, r=Mark-Simulacrum

Browse Source 
build-manifest: stop generating numbered channel names except for stable

This fixes numbered channel names being created for the nightly channel, and once the root cause of this rides the trains, for beta.

r? `@Mark-Simulacrum`
This commit is contained in:
bors 2020-10-12 15:50:36 +00:00
commit f3ab6f0584
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/build-manifest/src/main.rs
View File

@ -252,12 +252,13 @@ impl Builder {
}
let manifest = self.build_manifest();
let rust_version = self.versions.rustc_version();
self.write_channel_files(self.versions.channel(), &manifest);
if self.versions.channel() != rust_version {
self.write_channel_files(&rust_version, &manifest);
}
if self.versions.channel() == "stable" {
// channel-rust-1.XX.YY.toml
let rust_version = self.versions.rustc_version();
self.write_channel_files(rust_version, &manifest);
// channel-rust-1.XX.toml
let major_minor = rust_version.split('.').take(2).collect::<Vec<_>>().join(".");
self.write_channel_files(&major_minor, &manifest);
}