Skip to content

Commit 6225f7f

Browse files
authored
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.
1 parent c148fb4 commit 6225f7f

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ struct ZipBuilder {
109109
/// - Parameter logsOutputDir: The output directory for any logs. If `nil`, a temporary
110110
/// directory will be used.
111111
init(repoDir: URL,
112-
buildRoot: URL? = nil,
113-
outputDir: URL? = nil,
114-
localPodspecPath: URL? = nil,
115-
logsOutputDir: URL? = nil) {
112+
buildRoot: URL?,
113+
outputDir: URL?,
114+
localPodspecPath: URL?,
115+
logsOutputDir: URL?) {
116116
self.repoDir = repoDir
117117
self.buildRoot = buildRoot
118118
self.outputDir = outputDir

ReleaseTooling/Sources/ZipBuilder/main.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ struct ZipBuilderTool: ParsableCommand {
205205
let paths = ZipBuilder.FilesystemPaths(repoDir: repoDir,
206206
buildRoot: buildRoot,
207207
outputDir: outputDir,
208+
localPodspecPath: localPodspecPath,
208209
logsOutputDir: outputDir?
209210
.appendingPathComponent("build_logs"))
210211

scripts/build_non_firebase_sdks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ done
3636
echo "]" >> "${ZIP_POD_JSON}"
3737
mkdir -p "${REPO}"/sdk_zip
3838
swift run zip-builder --keep-build-artifacts --update-pod-repo --repo-dir "${REPO}" \
39-
--zip-pods "${ZIP_POD_JSON}" --output-dir "${REPO}"/sdk_zip --enable-build-dependencies
39+
--zip-pods "${ZIP_POD_JSON}" --output-dir "${REPO}"/sdk_zip --disable-build-dependencies
4040

4141
unzip -o "${REPO}"/sdk_zip/Frameworks.zip -d "${HOME}"/ios_frameworks/Firebase/
4242

0 commit comments

Comments
 (0)