bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #113804 - Kobzol:opt-dist-version, r=Mark-Simulacrum

Browse source 
Resolve correct archive version name in `opt-dist`

Should resolve the master part of https://github.com/rust-lang/rust/issues/113784.

r? `@Mark-Simulacrum`
This commit is contained in:
Matthias Krüger 2023-07-31 22:51:13 +02:00 • committed by GitHub
commit 756da76814
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/tools/opt-dist/src/tests.rs
View file

@ -1,8 +1,8 @@
use crate::environment::Environment; use crate::environment::Environment;
use crate::exec::cmd; use crate::exec::cmd;
use crate::utils::io::{copy_directory, unpack_archive}; use crate::utils::io::{copy_directory, find_file_in_dir, unpack_archive};
use anyhow::Context; use anyhow::Context;
use camino::Utf8PathBuf; use camino::{Utf8Path, Utf8PathBuf};
/// Run tests on optimized dist artifacts. /// Run tests on optimized dist artifacts.
pub fn run_tests(env: &dyn Environment) -> anyhow::Result<()> { pub fn run_tests(env: &dyn Environment) -> anyhow::Result<()> {
@ -22,13 +22,14 @@ pub fn run_tests(env: &dyn Environment) -> anyhow::Result<()> {
Ok(extracted_path) Ok(extracted_path)
}; };
let host_triple = env.host_triple(); let host_triple = env.host_triple();
let version = find_dist_version(&dist_dir)?;
// Extract rustc, libstd, cargo and src archives to create the optimized sysroot // Extract rustc, libstd, cargo and src archives to create the optimized sysroot
let rustc_dir = extract_dist_dir(&format!("rustc-nightly-{host_triple}"))?.join("rustc"); let rustc_dir = extract_dist_dir(&format!("rustc-{version}-{host_triple}"))?.join("rustc");
let libstd_dir = extract_dist_dir(&format!("rust-std-nightly-{host_triple}"))? let libstd_dir = extract_dist_dir(&format!("rust-std-{version}-{host_triple}"))?
.join(format!("rust-std-{host_triple}")); .join(format!("rust-std-{host_triple}"));
let cargo_dir = extract_dist_dir(&format!("cargo-nightly-{host_triple}"))?.join("cargo"); let cargo_dir = extract_dist_dir(&format!("cargo-{version}-{host_triple}"))?.join("cargo");
let extracted_src_dir = extract_dist_dir("rust-src-nightly")?.join("rust-src"); let extracted_src_dir = extract_dist_dir(&format!("rust-src-{version}"))?.join("rust-src");
// We need to manually copy libstd to the extracted rustc sysroot // We need to manually copy libstd to the extracted rustc sysroot
copy_directory( copy_directory(
@ -99,3 +100,15 @@ llvm-config = "{llvm_config}"
} }
cmd(&args).env("COMPILETEST_FORCE_STAGE0", "1").run().context("Cannot execute tests") cmd(&args).env("COMPILETEST_FORCE_STAGE0", "1").run().context("Cannot execute tests")
} }
/// Tries to find the version of the dist artifacts (either nightly, beta, or 1.XY.Z).
fn find_dist_version(directory: &Utf8Path) -> anyhow::Result<String> {
// Lookup a known file with a unique prefix and extract the version from its filename
let archive = find_file_in_dir(directory, "reproducible-artifacts-", ".tar.xz")?
.file_name()
.unwrap()
.to_string();
let (version, _) =
archive.strip_prefix("reproducible-artifacts-").unwrap().split_once("-").unwrap();
Ok(version.to_string())
}