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

Revert "[Release Tooling] Stage and publish with `--skip-import-valid… #12102

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Revert "[Release Tooling] Stage and publish with `--skip-import-valid… #12102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions ReleaseTooling/Sources/FirebaseManifest/Pod.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,14 @@ public struct Pod {
public func podspecName() -> String {
return "\(name).podspec"
}

/// The Firebase pod does not support import validation with Xcode 12 because of the deprecated
/// ML pods not supporting the ARM Mac slice.
public func skipImportValidation() -> String {
if name == "Firebase" {
return "--skip-import-validation"
} else {
return ""
}
}
}
5 changes: 3 additions & 2 deletions ReleaseTooling/Sources/FirebaseReleaser/Push.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ enum Push {
switch destination {
case .staging:
return "pod repo push --skip-tests --use-json \(warningsOK) \(stagingLocation) " +
"--skip-import-validation" + " \(pod.podspecName()) " +
pod.skipImportValidation() + " \(pod.podspecName()) " +
"--sources=\(stagingRepo).git,https://cdn.cocoapods.org"
case .trunk:
return "pod trunk push --skip-tests --synchronous \(warningsOK) " +
"--skip-import-validation" + " ~/.cocoapods/repos/\(stagingLocation)/\(pod.name)/" +
pod
.skipImportValidation() + " ~/.cocoapods/repos/\(stagingLocation)/\(pod.name)/" +
"\(manifest.versionString(pod))/\(pod.name).podspec.json"
}
}()
Expand Down
Loading