Skip to content

feat(preprod): make sure at least one app bundle is present for upload #2795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trevor-e merged 6 commits into from
Sep 24, 2025
Merged

feat(preprod): make sure at least one app bundle is present for upload #2795

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
067013a
check for Info.plist inside app
trevor-e Sep 23, 2025
9a1aa5a
lint
trevor-e Sep 23, 2025
711543c
glob for all .app
trevor-e Sep 23, 2025
1bde751
feat(preprod): make sure at least one app bundle is present for upload
trevor-e Sep 23, 2025
cc2cd1c
Merge branch 'master' into telkins/empty-products
trevor-e Sep 24, 2025
654be79
lint
trevor-e Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/utils/build/validation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,13 @@ where
&path.join("Products/**/*.app").to_string_lossy(),
MatchOptions::new(),
)?;
for app_path in paths.flatten().filter(|path| path.is_dir()) {

let app_paths: Vec<_> = paths.flatten().filter(|path| path.is_dir()).collect();
if app_paths.is_empty() {
anyhow::bail!("Invalid XCArchive: No .app bundles found in the Products/ directory");
}
Comment on lines +83 to +86
Copy link
Copy Markdown
Member

@szokeasaurusrex szokeasaurusrex Sep 24, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Here's a little tip to make this code more efficient:

Suggested change
let app_paths: Vec<_> = paths.flatten().filter(|path| path.is_dir()).collect();
if app_paths.is_empty() {
error!("Invalid XCArchive: No .app bundles found in the Products/ directory");
return false;
}
let mut app_paths = paths.flatten().filter(|path| path.is_dir()).peekable();
if app_paths.peek().is_none() {
error!("Invalid XCArchive: No .app bundles found in the Products/ directory");
return false;
}

The difference is that, in your proposal, you are eagerly computing the filtered app_paths, and you are allocating a whole vector to store all of them. If paths is large, then this is potentially compute-inefficient and memory-inefficient.

With my suggestion, you avoid eagerly computing the entire app_paths. Instead, we only peek the first item, which means internally, the iterator only needs to compute and store the first value. Because iterators in Rust are lazy, we only compute the values as we iterate over them, saving ourselves a memory allocation, and potentially saving us from having to iterate all of the paths, in the case where we detect an invalid XCArchive and exit early.

I suspect the actual difference in performance is quite small here, but I want to highlight this, as collect is an expensive operation (it iterates the entire iterator), and in general, we should defer calling collect until as late as possible or avoid calling it entirely, as we do here.

Copy link
Copy Markdown
Member Author

@trevor-e trevor-e Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think eagerly collecting makes more sense in this case since paths is going to be small, <= 5 for basically 99.9% of apps we see. Working directly with the iterator like that makes the code too clever and less readable IMO, e.g. now app_paths has to be mutable.

Copy link
Copy Markdown
Member

@szokeasaurusrex szokeasaurusrex Sep 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's also fair, admittedly I did not know how many paths we typically expect. If it's smaller than the readability improvement from collecting is likely worth it


for app_path in app_paths {
if !app_path.join("Info.plist").exists() {
anyhow::bail!(
"Invalid XCArchive: Missing required Info.plist file in .app bundle: {}",
Expand Down