From 5973fd42a2e9475bb36c07cbd9985870ad5ff9a1 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Mon, 12 Oct 2020 17:39:13 +0200 Subject: [PATCH] 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. --- src/tools/build-manifest/src/main.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index b35f3a595fb38..7ee28cd6e5d95 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -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::>().join("."); self.write_channel_files(&major_minor, &manifest); }