Skip to content

Commit 8e48726

Browse files
committed
Auto merge of #117349 - Skgland:easy-beta-channels-test, r=<try>
[Experiment] for #117191 Based on the request in #117191 (comment)
2 parents 489647f + 183379c commit 8e48726

File tree

1 file changed

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

1 file changed

+23
-0
lines changed

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

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

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

0 commit comments

Comments
 (0)