bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #122136 - Kobzol:opt-dist-lookup-logic, r=Mark-Simulacrum

Browse source 
Include all library files in artifact summary on CI

It's not worth it to maintain any custom logic here. Just print all files in the `lib` directory, this should be forward compatible.

This fixes https://github.com/rust-lang/rust/pull/121866, based on https://github.com/rust-lang/rust/pull/121967.

r? `@Mark-Simulacrum`
This commit is contained in:
Guillaume Gomez 2024-03-07 18:32:48 +01:00 • committed by GitHub
commit fcb2cbc08f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/tools/opt-dist/src/utils/artifact_size.rs
View file

@ -15,21 +15,8 @@ pub fn print_binary_sizes(env: &Environment) -> anyhow::Result<()> {
let root = env.build_artifacts().join("stage2"); let root = env.build_artifacts().join("stage2");
let all_lib_files = get_files_from_dir(&root.join("lib"), None)?;
let mut files = get_files_from_dir(&root.join("bin"), None)?; let mut files = get_files_from_dir(&root.join("bin"), None)?;
files.extend(get_files_from_dir(&root.join("lib"), Some(".so"))?); files.extend(get_files_from_dir(&root.join("lib"), None)?);
// libLLVM.so can be named libLLVM.so.<suffix>, so we try to explicitly add it here if it
// wasn't found by the above call.
if !files.iter().any(|f| f.file_name().unwrap_or_default().starts_with("libLLVM")) {
if let Some(llvm_lib) =
all_lib_files.iter().find(|f| f.file_name().unwrap_or_default().starts_with("libLLVM"))
{
files.push(llvm_lib.clone());
}
}
files.sort_unstable(); files.sort_unstable();
let items: Vec<_> = files let items: Vec<_> = files