Disable build dependencies. (#6986)

* Disable build dependencies. This should fix #6973. Was accidentally enabled when migrating the argument names. * Fix localPodspecPath parsing. * Temporarily enable zip CI test. * Also enable packaging * Revert GHA test changes.
firebase · Nov 18, 2020 · 6225f7f · 6225f7f
1 parent c148fb4
commit 6225f7f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift
@@ -109,10 +109,10 @@ struct ZipBuilder {
     /// - Parameter logsOutputDir: The output directory for any logs. If `nil`, a temporary
     ///      directory will be used.
     init(repoDir: URL,
-         buildRoot: URL? = nil,
-         outputDir: URL? = nil,
-         localPodspecPath: URL? = nil,
-         logsOutputDir: URL? = nil) {
+         buildRoot: URL?,
+         outputDir: URL?,
+         localPodspecPath: URL?,
+         logsOutputDir: URL?) {
       self.repoDir = repoDir
       self.buildRoot = buildRoot
       self.outputDir = outputDir

diff --git a/ReleaseTooling/Sources/ZipBuilder/main.swift b/ReleaseTooling/Sources/ZipBuilder/main.swift
@@ -205,6 +205,7 @@ struct ZipBuilderTool: ParsableCommand {
     let paths = ZipBuilder.FilesystemPaths(repoDir: repoDir,
                                            buildRoot: buildRoot,
                                            outputDir: outputDir,
+                                           localPodspecPath: localPodspecPath,
                                            logsOutputDir: outputDir?
                                              .appendingPathComponent("build_logs"))
 

diff --git a/scripts/build_non_firebase_sdks.sh b/scripts/build_non_firebase_sdks.sh
@@ -36,7 +36,7 @@ done
 echo "]" >>  "${ZIP_POD_JSON}"
 mkdir -p "${REPO}"/sdk_zip
 swift run zip-builder --keep-build-artifacts --update-pod-repo --repo-dir "${REPO}" \
-    --zip-pods "${ZIP_POD_JSON}" --output-dir "${REPO}"/sdk_zip --enable-build-dependencies
+    --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/