Skip to content

Commit c1ccc29

Browse files
committed
Auto merge of #117191 - Skgland:easy-beta-channels, r=Mark-Simulacrum
generate beta manifests as pre-requisit to rust-lang/rustup#1329 <rust-lang/rustup#1329 (comment)> mentioned (a while ago) this would be the next step
2 parents 5103173 + 0e8f155 commit c1ccc29

File tree

1 file changed

+23
-0
lines changed
  • src/tools/build-manifest/src

1 file changed

+23
-0
lines changed

Diff for: src/tools/build-manifest/src/main.rs

+23
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,29 @@ impl Builder {
266266
// channel-rust-1.XX.toml
267267
let major_minor = rust_version.split('.').take(2).collect::<Vec<_>>().join(".");
268268
self.write_channel_files(&major_minor, &manifest);
269+
} else if channel == "beta" {
270+
// channel-rust-1.XX.YY-beta.Z.toml
271+
let rust_version = self
272+
.versions
273+
.version(&PkgType::Rust)
274+
.expect("missing Rust tarball")
275+
.version
276+
.expect("missing Rust version")
277+
.split(' ')
278+
.next()
279+
.unwrap()
280+
.to_string();
281+
self.write_channel_files(&rust_version, &manifest);
282+
283+
// channel-rust-1.XX.YY-beta.toml
284+
let major_minor_patch_beta =
285+
rust_version.split('.').take(3).collect::<Vec<_>>().join(".");
286+
self.write_channel_files(&major_minor_patch_beta, &manifest);
287+
288+
// channel-rust-1.XX-beta.toml
289+
let major_minor_beta =
290+
format!("{}-beta", rust_version.split('.').take(2).collect::<Vec<_>>().join("."));
291+
self.write_channel_files(&major_minor_beta, &manifest);
269292
}
270293

271294
if let Some(path) = std::env::var_os("BUILD_MANIFEST_SHIPPED_FILES_PATH") {

0 commit comments

Comments
 (0)