Skip to content
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

Jump to bottom

[Infra] Switch zip building over to Xcode 15.2 #12737

Merged
merged 30 commits into from
Apr 18, 2024
Merged

[Infra] Switch zip building over to Xcode 15.2 #12737

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6945629
[Infra] Switch zip building over to Xcode 15.2
ncooke3 Apr 9, 2024
f098d2b
Fix yml syntax
ncooke3 Apr 9, 2024
24fb157
Fix yml matrix syntax throughout
ncooke3 Apr 9, 2024
3e42db3
Fix symlink issue when creating xcframework before Xcode 15.3
ncooke3 Apr 13, 2024
ddbc247
Merge branch 'main' into nc/zip-testing
ncooke3 Apr 13, 2024
6739980
Add changelog entry
ncooke3 Apr 13, 2024
99b6423
Catch error
ncooke3 Apr 15, 2024
2e58c41
Don't build on arm macs
ncooke3 Apr 15, 2024
cc4088a
Revert "Don't build on arm macs"
ncooke3 Apr 15, 2024
83ff298
Try macos14-arm
ncooke3 Apr 15, 2024
d77d85b
Merge branch 'main' into nc/zip-testing
ncooke3 Apr 16, 2024
63df007
plain macos-14 is arm
ncooke3 Apr 16, 2024
7ccc76d
Shortcut test macos14 zip
ncooke3 Apr 17, 2024
1ba4536
Fix invalid syntax
ncooke3 Apr 17, 2024
e0dfc4f
Fix invalid syntax (1)
ncooke3 Apr 17, 2024
7105e5f
wrokaround Xcode 15 resource issues
ncooke3 Apr 17, 2024
8e2de3e
Delete resources after copy
ncooke3 Apr 17, 2024
8c51f9d
Move delete
ncooke3 Apr 17, 2024
195aaa5
MAdd logging
ncooke3 Apr 17, 2024
ce646f4
Debug
ncooke3 Apr 17, 2024
6701681
debug workaround by only running FST
ncooke3 Apr 17, 2024
337abdb
Disable Firebase core tests
ncooke3 Apr 17, 2024
2f3de81
Debug workaround one last time
ncooke3 Apr 17, 2024
7da0ca4
try printig file structure
ncooke3 Apr 17, 2024
ced882f
last attempt
ncooke3 Apr 17, 2024
97cb7f6
debug after local download
ncooke3 Apr 17, 2024
85892fa
try different approach
ncooke3 Apr 17, 2024
86de133
getting closer?
ncooke3 Apr 18, 2024
13dd16e
Revert all debugging code
ncooke3 Apr 18, 2024
4b6fa9f
Disable FST and set Xcode version for package-* jobs
ncooke3 Apr 18, 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
11 changes: 7 additions & 4 deletions ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,10 +709,13 @@ struct FrameworkBuilder {
.appendingPathComponent(frameworkBuildName(name) + ".xcframework")

// The arguments for the frameworks need to be separated.
var frameworkArgs: [String] = []
for frameworkBuilt in frameworks {
frameworkArgs.append("-framework")
frameworkArgs.append(frameworkBuilt.path)
let frameworkArgs = frameworks.flatMap {
[
"-framework",
// Xcode 15.0-15.2: Return the canonical path to work around issue
// https://forums.swift.org/t/67439
try! $0.resourceValues(forKeys: [.canonicalPathKey]).canonicalPath!,
ncooke3 marked this conversation as resolved.
Show resolved Hide resolved
]
}

let outputArgs = ["-output", xcframework.path]
Expand Down
Loading