Skip to content

[Release Tooling] Fix METADATA.md regression introduced in #12595 #12661

New issue

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

#

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

Already on GitHub? # to your account

Merged
merged 8 commits into from
Apr 2, 2024
Merged

[Release Tooling] Fix METADATA.md regression introduced in #12595 #12661

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2c595a6
[Release Tooling] Fix METADATA.md regression introduced in #12595
ncooke3 Mar 29, 2024
f98c3f7
Remove newline
ncooke3 Mar 29, 2024
ff7b64a
Debug
ncooke3 Apr 2, 2024
53b75b4
Debug (1)
ncooke3 Apr 2, 2024
eb3c4c8
Build dependency string after moving re-organizing XCFrameworks
ncooke3 Apr 2, 2024
f358d87
Update approach
ncooke3 Apr 2, 2024
7e7c696
Remove newline
ncooke3 Apr 2, 2024
7bbbd8d
map -> flatMap
ncooke3 Apr 2, 2024
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
16 changes: 13 additions & 3 deletions ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,11 +690,21 @@ struct ZipBuilder {
result += "\n" // Necessary for Resource message to print properly in markdown.

// Check if there is a Resources directory, and if so, add the disclaimer to the dependency
// string.
// string. At this point, resources will be at the root of XCFrameworks.
do {
let fileManager = FileManager.default
let resourceDirs = try fileManager.recursivelySearch(for: .directories(name: "Resources"),
in: dir)
let resourceDirs = try fileManager.contentsOfDirectory(
at: dir,
includingPropertiesForKeys: [.isDirectoryKey]
).flatMap {
try fileManager.contentsOfDirectory(
at: $0,
includingPropertiesForKeys: [.isDirectoryKey]
)
}.filter {
$0.lastPathComponent == "Resources"
}

if !resourceDirs.isEmpty {
result += Constants.resourcesRequiredText
result += "\n" // Separate from next pod in listing for text version.
Expand Down
Loading