bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #117191 - Skgland:easy-beta-channels, r=Mark-Simulacrum

Browse source 
generate beta manifests as pre-requisit to rust-lang/rustup#1329

<https://github.com/rust-lang/rustup/issues/1329#issuecomment-1134946736> mentioned (a while ago) this would be the next step
This commit is contained in:
bors 2023-11-05 19:43:04 +00:00
commit c1ccc29cd6
1 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tools/build-manifest/src/main.rs
View file

@ -266,6 +266,29 @@ impl Builder {
// channel-rust-1.XX.toml // 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);
} else if channel == "beta" {
// channel-rust-1.XX.YY-beta.Z.toml
let rust_version = self
.versions
.version(&PkgType::Rust)
.expect("missing Rust tarball")
.version
.expect("missing Rust version")
.split(' ')
.next()
.unwrap()
.to_string();
self.write_channel_files(&rust_version, &manifest);
// channel-rust-1.XX.YY-beta.toml
let major_minor_patch_beta =
rust_version.split('.').take(3).collect::<Vec<_>>().join(".");
self.write_channel_files(&major_minor_patch_beta, &manifest);
// channel-rust-1.XX-beta.toml
let major_minor_beta =
format!("{}-beta", rust_version.split('.').take(2).collect::<Vec<_>>().join("."));
self.write_channel_files(&major_minor_beta, &manifest);
} }
if let Some(path) = std::env::var_os("BUILD_MANIFEST_SHIPPED_FILES_PATH") { if let Some(path) = std::env::var_os("BUILD_MANIFEST_SHIPPED_FILES_PATH") {