Skip to content

Commit f3ab6f0

Browse files
committed
Auto merge of #77854 - pietroalbini:ETOOMANYCHANNELS, r=Mark-Simulacrum
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`
2 parents d6b5ffb + 5973fd4 commit f3ab6f0

File tree

1 file changed

+5
-4
lines changed
  • src/tools/build-manifest/src

1 file changed

+5
-4
lines changed

src/tools/build-manifest/src/main.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -252,12 +252,13 @@ impl Builder {
252252
}
253253
let manifest = self.build_manifest();
254254

255-
let rust_version = self.versions.rustc_version();
256255
self.write_channel_files(self.versions.channel(), &manifest);
257-
if self.versions.channel() != rust_version {
258-
self.write_channel_files(&rust_version, &manifest);
259-
}
260256
if self.versions.channel() == "stable" {
257+
// channel-rust-1.XX.YY.toml
258+
let rust_version = self.versions.rustc_version();
259+
self.write_channel_files(rust_version, &manifest);
260+
261+
// channel-rust-1.XX.toml
261262
let major_minor = rust_version.split('.').take(2).collect::<Vec<_>>().join(".");
262263
self.write_channel_files(&major_minor, &manifest);
263264
}

0 commit comments

Comments
 (0)