Stage to SpecsStaging instead of cpdc (#7556)

Author: paulb777

ReleaseTooling/DEVELOP.md

@@ -16,7 +16,7 @@ If the `--zip-pods` option is not specified, the tool will build a Firebase zip
 
 For release engineers (Googlers packaging an upcoming Firebase release) these commands should also
 be used:
--  `--custom-spec-repos sso://cpdc-internal/firebase`
+-  `--custom-spec-repos https://github.com/firebase/SpecsStaging.git`
   - This pulls the latest podspecs from the CocoaPods staging area.
 - `--enable-carthage-build` Turns on generation of Carthage zips and json file updates.
 - `--keep-build-artifacts` Useful for debugging and verifying the zip build contents.
@@ -25,7 +25,7 @@ Putting them all together, here's a common command to build a releaseable Zip fi
 
 ```
 swift run zip-builder --update-pod-repo \
---custom-spec-repos sso://cpdc-internal/firebase \
+--custom-spec-repos https://github.com/firebase/SpecsStaging.git \
 --enable-carthage-build \
 --keep-build-artifacts
 ```

ReleaseTooling/Sources/FirebaseReleaser/Push.swift

@@ -20,25 +20,19 @@ import FirebaseManifest
 import Utils
 
 private enum Destination {
-  case cpdc, trunk
+  case staging, trunk
 }
 
 enum Push {
-  static func pushPodsToCPDC(gitRoot: URL) {
-    push(to: .cpdc, gitRoot: gitRoot)
+  static func pushPodsToStaging(gitRoot: URL) {
+    push(to: .staging, gitRoot: gitRoot)
   }
 
   static func publishPodsToTrunk(gitRoot: URL) {
     push(to: .trunk, gitRoot: gitRoot)
   }
 
   private static func push(to destination: Destination, gitRoot: URL) {
-    let cpdcRepo = "sso://cpdc-internal/firebase"
-    let cpdcLocation = findOrRegisterPrivateCocoaPodsRepo(
-      repo: cpdcRepo,
-      gitRoot: gitRoot,
-      defaultRepoName: "cpdc-internal-firebase"
-    )
     let stagingRepo = "[email protected]:firebase/SpecsStaging"
     let stagingLocation = findOrRegisterPrivateCocoaPodsRepo(
       repo: stagingRepo,
@@ -52,23 +46,14 @@ enum Push {
 
       let command: String = {
         switch destination {
-        case .cpdc:
-          var pushCommands = ""
-          if pod.isClosedSource {
-            // Push closed source pods to SpecsStaging to keep CI working.
-            pushCommands =
-              "pod repo push --skip-tests --use-json \(warningsOK) \(stagingLocation) " +
-              pod.skipImportValidation() + " \(pod.podspecName()) " +
-              "--sources=\(stagingRepo).git,https://cdn.cocoapods.org && "
-          }
-          pushCommands += "pod repo push --skip-tests --use-json \(warningsOK) \(cpdcLocation) " +
+        case .staging:
+          return "pod repo push --skip-tests --use-json \(warningsOK) \(stagingLocation) " +
             pod.skipImportValidation() + " \(pod.podspecName()) " +
-            "--sources=\(cpdcRepo).git,https://cdn.cocoapods.org"
-          return pushCommands
-
+            "--sources=\(stagingRepo).git,https://cdn.cocoapods.org"
         case .trunk:
           return "pod trunk push --skip-tests --synchronous \(warningsOK) " +
-            pod.skipImportValidation() + " ~/.cocoapods/repos/\(cpdcLocation)/Specs/\(pod.name)/" +
+            pod
+            .skipImportValidation() + " ~/.cocoapods/repos/\(stagingLocation)/Specs/\(pod.name)/" +
             "\(manifest.versionString(pod))/\(pod.name).podspec.json"
         }
       }()

ReleaseTooling/Sources/FirebaseReleaser/main.swift

@@ -43,7 +43,7 @@ struct FirebaseReleaser: ParsableCommand {
           help: "Publish the podspecs to the CocoaPodsTrunk")
   var publish: Bool
 
-  /// Set this option to only update the podspecs on cpdc.
+  /// Set this option to only update the podspecs on SpecsStaging.
   @Option(default: false,
           help: "Update the podspecs only")
   var pushOnly: Bool
@@ -72,11 +72,11 @@ struct FirebaseReleaser: ParsableCommand {
       Shell.executeCommand("git branch --set-upstream-to=origin/\(branch) \(branch)",
                            workingDir: gitRoot)
       Tags.createTags(gitRoot: gitRoot)
-      Push.pushPodsToCPDC(gitRoot: gitRoot)
+      Push.pushPodsToStaging(gitRoot: gitRoot)
     } else if updateTagsOnly {
       Tags.updateTags(gitRoot: gitRoot)
     } else if pushOnly {
-      Push.pushPodsToCPDC(gitRoot: gitRoot)
+      Push.pushPodsToStaging(gitRoot: gitRoot)
     } else if publish {
       Push.publishPodsToTrunk(gitRoot: gitRoot)
     }