Skip to content

Commit a0fcb67

Browse files
authored
Revert "[Release Tooling] Stage and publish with `--skip-import-valid… (#12102)
1 parent d869704 commit a0fcb67

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

ReleaseTooling/Sources/FirebaseManifest/Pod.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,14 @@ public struct Pod {
5454
public func podspecName() -> String {
5555
return "\(name).podspec"
5656
}
57+
58+
/// The Firebase pod does not support import validation with Xcode 12 because of the deprecated
59+
/// ML pods not supporting the ARM Mac slice.
60+
public func skipImportValidation() -> String {
61+
if name == "Firebase" {
62+
return "--skip-import-validation"
63+
} else {
64+
return ""
65+
}
66+
}
5767
}

ReleaseTooling/Sources/FirebaseReleaser/Push.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,12 @@ enum Push {
4848
switch destination {
4949
case .staging:
5050
return "pod repo push --skip-tests --use-json \(warningsOK) \(stagingLocation) " +
51-
"--skip-import-validation" + " \(pod.podspecName()) " +
51+
pod.skipImportValidation() + " \(pod.podspecName()) " +
5252
"--sources=\(stagingRepo).git,https://cdn.cocoapods.org"
5353
case .trunk:
5454
return "pod trunk push --skip-tests --synchronous \(warningsOK) " +
55-
"--skip-import-validation" + " ~/.cocoapods/repos/\(stagingLocation)/\(pod.name)/" +
55+
pod
56+
.skipImportValidation() + " ~/.cocoapods/repos/\(stagingLocation)/\(pod.name)/" +
5657
"\(manifest.versionString(pod))/\(pod.name).podspec.json"
5758
}
5859
}()

0 commit comments

Comments
 (0)