bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

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

Browse source 
This fixes numbered channel names being created for the nightly channel,
and once the root cause of this rides the trains, for beta.
This commit is contained in:
Pietro Albini 2020-10-12 17:39:13 +02:00
parent d6b5ffb5b4
commit 5973fd42a2
No known key found for this signature in database
GPG key ID: 3E06ABE80BAAF19C
1 changed files with 5 additions and 4 deletions
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 manifest = self.build_manifest();
let rust_version = self.versions.rustc_version();
self.write_channel_files(self.versions.channel(), &manifest); 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" { 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("."); let major_minor = rust_version.split('.').take(2).collect::<Vec<_>>().join(".");
self.write_channel_files(&major_minor, &manifest); self.write_channel_files(&major_minor, &manifest);
} }