Eliminate repo-dir option (#7201)

Author: paulb777

.github/workflows/zip.yml

@@ -25,7 +25,8 @@ jobs:
 
   package:
     # Don't run on private repo.
-    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
+    # TODO: Recomment before master merge
+#    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
     needs: build
     runs-on: macOS-latest
     steps:

ReleaseTooling/README.md

@@ -39,11 +39,6 @@ You can pass in launch arguments with Xcode by clicking "zip-builder" beside the
 
 These arguments assume you're running the command from the `ReleaseTooling` directory.
 
-**Required** arguments:
-
-- `--repo-dir <PATH_TO_firebase_ios_sdk_REPO>`
-  - The root of the `firebase-ios-sdk` repo.
-
 Typical argument (all use cases except Firebase release build):
 - `--zip-pods <PATH_TO.json>`
   - This is a JSON list of the pods to consolidate into a zip of binary frameworks. For example,
@@ -77,15 +72,13 @@ For release engineers (Googlers packaging an upcoming Firebase release) these co
 be used:
 -  `--custom-spec-repos sso://cpdc-internal/firebase`
   - This pulls the latest podspecs from the CocoaPods staging area.
-- `--repo-dir path` GitHub repo containing Template and Carthage json file inputs.
 - `--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.
 
 Putting them all together, here's a common command to build a releaseable Zip file:
 
 ```
 swift run zip-builder --update-pod-repo \
---repo-dir <PATH_TO_current.firebase_ios_sdk.repo> \
 --custom-spec-repos sso://cpdc-internal/firebase \
 --enable-carthage-build \
 --keep-build-artifacts

ReleaseTooling/Sources/ZipBuilder/main.swift

@@ -128,13 +128,6 @@ struct ZipBuilderTool: ParsableCommand {
 
   // MARK: - Filesystem Paths
 
-  /// The path to the root of the firebase-ios-sdk repo.
-  @Option(help: ArgumentHelp("""
-  The path to the repo from which the Firebase distribution is being built.
-  """),
-  transform: URL.init(fileURLWithPath:))
-  var repoDir: URL
-
   /// Path to override podspec search with local podspec.
   @Option(help: ArgumentHelp("Path to override podspec search with local podspec."),
           transform: URL.init(fileURLWithPath:))
@@ -160,17 +153,6 @@ struct ZipBuilderTool: ParsableCommand {
   // MARK: - Validation
 
   mutating func validate() throws {
-    // Validate the repoDir exists, as well as the templateDir.
-    guard FileManager.default.directoryExists(at: repoDir) else {
-      throw ValidationError("Included a repo-dir that doesn't exist.")
-    }
-
-    // Validate the templateDir exists.
-    let templateDir = ZipBuilder.FilesystemPaths.templateDir(fromRepoDir: repoDir)
-    guard FileManager.default.directoryExists(at: templateDir) else {
-      throw ValidationError("Missing template inside of the repo. \(templateDir) does not exist.")
-    }
-
     // Validate the output directory if provided.
     if let outputDir = outputDir, !FileManager.default.directoryExists(at: outputDir) {
       throw ValidationError("`output-dir` passed in does not exist. Value: \(outputDir)")
@@ -216,6 +198,22 @@ struct ZipBuilderTool: ParsableCommand {
       FileManager.registerBuildRoot(buildRoot: buildRoot.standardizedFileURL)
     }
 
+    // Get the repoDir by deleting four path components from this file to the repo root.
+    let repoDir = URL(fileURLWithPath: #file)
+      .deletingLastPathComponent().deletingLastPathComponent()
+      .deletingLastPathComponent().deletingLastPathComponent()
+
+    // Validate the repoDir exists, as well as the templateDir.
+    guard FileManager.default.directoryExists(at: repoDir) else {
+      fatalError("Failed to find the repo root at \(repoDir).")
+    }
+
+    // Validate the templateDir exists.
+    let templateDir = ZipBuilder.FilesystemPaths.templateDir(fromRepoDir: repoDir)
+    guard FileManager.default.directoryExists(at: templateDir) else {
+      fatalError("Missing template inside of the repo. \(templateDir) does not exist.")
+    }
+
     let paths = ZipBuilder.FilesystemPaths(repoDir: repoDir,
                                            buildRoot: buildRoot,
                                            outputDir: outputDir,

scripts/build_non_firebase_sdks.sh

@@ -35,7 +35,7 @@ do
 done
 echo "]" >>  "${ZIP_POD_JSON}"
 mkdir -p "${REPO}"/sdk_zip
-swift run zip-builder --keep-build-artifacts --update-pod-repo --repo-dir "${REPO}" \
+swift run zip-builder --keep-build-artifacts --update-pod-repo\
     --zip-pods "${ZIP_POD_JSON}" --output-dir "${REPO}"/sdk_zip --disable-build-dependencies
 
 unzip -o "${REPO}"/sdk_zip/Frameworks.zip -d "${HOME}"/ios_frameworks/Firebase/

scripts/build_zip.sh

@@ -27,6 +27,6 @@ OUTPUT_DIR="$REPO/$1"
 
 cd ReleaseTooling
 swift run zip-builder --keep-build-artifacts --update-pod-repo \
-    --repo-dir "${REPO}" --local-podspec-path "${REPO}" \
+    --local-podspec-path "${REPO}" \
     --enable-carthage-build --output-dir "${OUTPUT_DIR}" \
     --custom-spec-repos https://github.com/firebase/SpecsStaging.git