Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DNM] Testing current GRPC/FST with new Abseil bin #13342

Closed
wants to merge 3 commits into from
Closed

[DNM] Testing current GRPC/FST with new Abseil bin #13342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
25eda7e
[DNM] Testing current GRPC/FST with new Abseil bin
ncooke3 Jul 22, 2024
3886fc3
Unblock CI
ncooke3 Jul 22, 2024
df0760a
Attempt to unblock CI again
ncooke3 Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,9 +1405,9 @@ func googleAppMeasurementDependency() -> Package.Dependency {

// Point SPM CI to the tip of main of https://github.com/google/GoogleAppMeasurement so that the
// release process can defer publishing the GoogleAppMeasurement tag until after testing.
if ProcessInfo.processInfo.environment["FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT"] != nil {
return .package(url: appMeasurementURL, branch: "main")
}
// if ProcessInfo.processInfo.environment["FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT"] != nil {
// return .package(url: appMeasurementURL, branch: "main")
// }

return .package(url: appMeasurementURL, exact: "10.28.0")
}
Expand All @@ -1427,6 +1427,7 @@ func abseilDependency() -> Package.Dependency {
"https://github.com/google/abseil-cpp-binary.git",
"1.2024011601.1" ..< "1.2024011700.0"
)
return .package(url: packageInfo.url, branch: "nc/firestore-pre_rc1")
}

return .package(url: packageInfo.url, packageInfo.range)
Expand All @@ -1441,6 +1442,7 @@ func grpcDependency() -> Package.Dependency {
packageInfo = ("https://github.com/grpc/grpc-ios.git", "1.62.3" ..< "1.63.0")
} else {
packageInfo = ("https://github.com/google/grpc-binary.git", "1.62.2" ..< "1.63.0")
return .package(url: packageInfo.url, branch: "ncooke3-patch-1")
}

return .package(url: packageInfo.url, packageInfo.range)
Expand Down
2 changes: 1 addition & 1 deletion scripts/setup_spm_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# For example: Change `exact: "8.3.1"` to `branch: "main"`

sed -i '' 's#exact:[[:space:]]*"[0-9.]*"#branch: "main"#' Package.swift
# sed -i '' 's#exact:[[:space:]]*"[0-9.]*"#branch: "main"#' Package.swift


# Move schemes into place to run Swift Package Manager tests
Expand Down
Loading