Skip to content

Commit e432378

Browse files
authored
Some Release tooling cleanup (#6761)
1 parent 15a3116 commit e432378

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

ZipBuilder/Sources/FirebaseManifest/FirebaseManifest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import Foundation
2222
public let shared = Manifest(
2323
version: "7.0.0",
2424
pods: [
25-
Pod("GoogleUtilities", isFirebase: false, podVersion: "7.0.0", releasing: false),
25+
Pod("GoogleUtilities", isFirebase: false, podVersion: "7.0.0", releasing: true),
2626
Pod("GoogleDataTransport", isFirebase: false, podVersion: "8.0.0", releasing: true),
2727

2828
Pod("FirebaseCoreDiagnostics"),

ZipBuilder/Sources/FirebaseReleaser/Push.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ enum Push {
2424
let cpdcLocation = findCpdc(gitRoot: gitRoot)
2525
let manifest = FirebaseManifest.shared
2626

27-
for pod in manifest.pods {
28-
if !pod.releasing {
29-
continue
30-
}
27+
for pod in manifest.pods.filter({ $0.releasing }) {
3128
let warningsOK = pod.allowWarnings ? " --allow-warnings" : ""
3229

3330
Shell.executeCommand("pod repo push --skip-tests --use-json \(warningsOK) \(cpdcLocation) " +

ZipBuilder/Sources/FirebaseReleaser/Tags.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ enum Tags {
2727
createTag(gitRoot: gitRoot, tag: "CocoaPods-\(manifest.version)-beta",
2828
deleteExistingTags: deleteExistingTags)
2929

30-
for pod in manifest.pods {
31-
if pod.isFirebase {
32-
continue
33-
}
30+
for pod in manifest.pods.filter({ !$0.isFirebase && $0.releasing }) {
3431
if !pod.name.starts(with: "Google") {
3532
fatalError("Unrecognized Other Pod: \(pod.name). Only Google prefix is recognized")
3633
}

ZipBuilder/Sources/ZipBuilder/LaunchArgs.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ struct LaunchArgs {
182182
var templatePath = defaults.string(forKey: Key.templateDir.rawValue)
183183
if templatePath == nil, let repoDir = repoDir {
184184
templatePath = repoDir.path + "/ZipBuilder/Template"
185-
} else {
185+
}
186+
if templatePath == nil {
186187
LaunchArgs.exitWithUsageAndLog("Missing required key: `\(Key.templateDir)` for the folder " +
187188
"containing all required files to build frameworks.")
188189
}

0 commit comments

Comments
 (0)