From c36b5dbfbcb3c9854281fe99c0bedd469c586b92 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 10 Sep 2026 06:33:56 +0000 Subject: [PATCH 1/3] Sync c-core v1.84.0-pre2 --- gRPC-C++.podspec | 4 ++-- gRPC-Core.podspec | 4 ++-- gRPC-ProtoRPC.podspec | 2 +- gRPC-RxLibrary.podspec | 2 +- gRPC.podspec | 2 +- include/grpcpp/version_info.h | 4 ++-- src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec | 2 +- src/objective-c/!ProtoCompiler-gRPCPlugin.podspec | 2 +- src/objective-c/GRPCClient/version.h | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 4c23bc060..b4911c0b1 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -22,7 +22,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-C++' # TODO (mxyan): use version that match gRPC version when pod is stabilized - version = '1.84.0-pre1' + version = '1.84.0-pre2' s.version = version s.summary = 'gRPC C++ library' s.homepage = 'https://grpc.io' @@ -234,7 +234,7 @@ Pod::Spec.new do |s| ss.dependency "#{s.name}/Privacy", version ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '~> 1.20250512.2' + abseil_version = '~> 1.20250512.1' ss.dependency 'abseil/algorithm/container', abseil_version ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/config', abseil_version diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 9d743442c..444542799 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-Core' - version = '1.84.0-pre1' + version = '1.84.0-pre2' s.version = version s.summary = 'Core cross-platform gRPC library, written in C' s.homepage = 'https://grpc.io' @@ -47,7 +47,7 @@ Pod::Spec.new do |s| s.requires_arc = false name = 'grpc' - abseil_version = '~> 1.20250512.2' + abseil_version = '~> 1.20250512.1' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include diff --git a/gRPC-ProtoRPC.podspec b/gRPC-ProtoRPC.podspec index e62ded069..3a39288dc 100644 --- a/gRPC-ProtoRPC.podspec +++ b/gRPC-ProtoRPC.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-ProtoRPC' - version = '1.84.0-pre1' + version = '1.84.0-pre2' s.version = version s.summary = 'RPC library for Protocol Buffers, based on gRPC' s.homepage = 'https://grpc.io' diff --git a/gRPC-RxLibrary.podspec b/gRPC-RxLibrary.podspec index 4b670ca6e..f4a0873bd 100644 --- a/gRPC-RxLibrary.podspec +++ b/gRPC-RxLibrary.podspec @@ -21,7 +21,7 @@ Pod::Spec.new do |s| s.name = 'gRPC-RxLibrary' - version = '1.84.0-pre1' + version = '1.84.0-pre2' s.version = version s.summary = 'Reactive Extensions library for iOS/OSX.' s.homepage = 'https://grpc.io' diff --git a/gRPC.podspec b/gRPC.podspec index 5ca3aebe4..cd108cd53 100644 --- a/gRPC.podspec +++ b/gRPC.podspec @@ -20,7 +20,7 @@ Pod::Spec.new do |s| s.name = 'gRPC' - version = '1.84.0-pre1' + version = '1.84.0-pre2' s.version = version s.summary = 'gRPC client library for iOS/OSX' s.homepage = 'https://grpc.io' diff --git a/include/grpcpp/version_info.h b/include/grpcpp/version_info.h index efbb6cc0b..3f828cdfc 100644 --- a/include/grpcpp/version_info.h +++ b/include/grpcpp/version_info.h @@ -21,7 +21,7 @@ #define GRPC_CPP_VERSION_MAJOR 1 #define GRPC_CPP_VERSION_MINOR 84 #define GRPC_CPP_VERSION_PATCH 0 -#define GRPC_CPP_VERSION_TAG "pre1" -#define GRPC_CPP_VERSION_STRING "1.84.0-pre1" +#define GRPC_CPP_VERSION_TAG "pre2" +#define GRPC_CPP_VERSION_STRING "1.84.0-pre2" #endif // GRPCPP_VERSION_INFO_H diff --git a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec index 0de48edb1..fbc3e5397 100644 --- a/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec @@ -42,7 +42,7 @@ Pod::Spec.new do |s| # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # before them. s.name = '!ProtoCompiler-gRPCCppPlugin' - v = '1.84.0-pre1' + v = '1.84.0-pre2' s.version = v s.summary = 'The gRPC ProtoC plugin generates C++ files from .proto services.' s.description = <<-DESC diff --git a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec index c7f8b7b28..2aec18aa9 100644 --- a/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec +++ b/src/objective-c/!ProtoCompiler-gRPCPlugin.podspec @@ -42,7 +42,7 @@ Pod::Spec.new do |s| # exclamation mark ensures that other "regular" pods will be able to find it as it'll be installed # before them. s.name = '!ProtoCompiler-gRPCPlugin' - v = '1.84.0-pre1' + v = '1.84.0-pre2' s.version = v s.summary = 'The gRPC ProtoC plugin generates Objective-C files from .proto services.' s.description = <<-DESC diff --git a/src/objective-c/GRPCClient/version.h b/src/objective-c/GRPCClient/version.h index 5aed78009..7a009afbd 100644 --- a/src/objective-c/GRPCClient/version.h +++ b/src/objective-c/GRPCClient/version.h @@ -22,4 +22,4 @@ // instead. This file can be regenerated from the template by running // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.84.0-pre1" +#define GRPC_OBJC_VERSION_STRING @"1.84.0-pre2" From 50135336b0f63bcb3439daf7027e2db542590adc Mon Sep 17 00:00:00 2001 From: Aslam Ansari Date: Thu, 10 Sep 2026 15:35:05 +0530 Subject: [PATCH 2/3] updated abseil pod version --- gRPC-C++.podspec | 2 +- gRPC-Core.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index b4911c0b1..e8f87338c 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -234,7 +234,7 @@ Pod::Spec.new do |s| ss.dependency "#{s.name}/Privacy", version ss.dependency "#{s.name}/Interface", version ss.dependency 'gRPC-Core', version - abseil_version = '~> 1.20250512.1' + abseil_version = '~> 1.20250512.2' ss.dependency 'abseil/algorithm/container', abseil_version ss.dependency 'abseil/base/base', abseil_version ss.dependency 'abseil/base/config', abseil_version diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index 444542799..9cb522484 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -47,7 +47,7 @@ Pod::Spec.new do |s| s.requires_arc = false name = 'grpc' - abseil_version = '~> 1.20250512.1' + abseil_version = '~> 1.20250512.2' # When creating a dynamic framework, name it grpc.framework instead of gRPC-Core.framework. # This lets users write their includes like `#include ` as opposed to `#include From 8de63ad86e6283d3742111cd76325b564fd88826 Mon Sep 17 00:00:00 2001 From: Aslam Ansari Date: Thu, 10 Sep 2026 13:49:19 +0530 Subject: [PATCH 3/3] updated the script to run linting only for iOS --- scripts/release_cocoapod.sh | 3 +++ scripts/skip_pod_push_lint.sh | 28 ++++++++++++++-------------- scripts/wait_for_pod_release.sh | 1 + 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/scripts/release_cocoapod.sh b/scripts/release_cocoapod.sh index 3054b83b7..cca9a2636 100755 --- a/scripts/release_cocoapod.sh +++ b/scripts/release_cocoapod.sh @@ -13,6 +13,9 @@ if [ -z "$TARGET_PODSPEC" ]; then exit 1 fi +# Configure pod trunk push lint to validate on iOS only (--no-subspecs --fail-fast) +"$(dirname "$0")/skip_pod_push_lint.sh" + echo "Publishing podspec $TARGET_PODSPEC" pushd ${TARGET_DIR} diff --git a/scripts/skip_pod_push_lint.sh b/scripts/skip_pod_push_lint.sh index f7c352164..2cffb9a2b 100755 --- a/scripts/skip_pod_push_lint.sh +++ b/scripts/skip_pod_push_lint.sh @@ -1,20 +1,20 @@ #!/bin/bash # -# Script to disable pod lint during trunk push. -# -# The script provides an ad-hoc patch to the internal cocoapod push command by removing the -# validation / lint steps. The script should be relatively stable for runners with a fixed virtual -# mac os x image, but may require updates to the Gem/Trunk versioning if upgrading to a new runner +# Script to optimize pod lint during trunk push so it validates on iOS only +# (with --no-subspecs and --fail-fast) instead of compiling across all 5 platforms. +# This ensures any podspec, dependency, or compilation error is caught while +# keeping validation under ~20 minutes instead of exceeding the 6-hour timeout. set -ex -# env setup -GEM_VERSION=3.0.0 -POD_TRUNK_VERSION=1.6.0 +PUSH_FILES=$(find /opt/homebrew /usr/local /Library/Ruby "$HOME/.gem" $(gem env gemdir 2>/dev/null) \ + -name "push.rb" -path "*/cocoapods-trunk-*/lib/pod/command/trunk/push.rb" 2>/dev/null | sort -u) -# PUSH_FILE_DIR="/Library/Ruby/Gems/2.6.0/gems/cocoapods-trunk-1.6.0/lib/pod/command/trunk" -PUSH_FILE_DIR="/usr/local/lib/ruby/gems/${GEM_VERSION}/gems/cocoapods-trunk-${POD_TRUNK_VERSION}/lib/pod/command/trunk" +if [ -z "$PUSH_FILES" ]; then + echo "ERROR: Could not locate cocoapods-trunk push.rb" + exit 1 +fi -# remove validation steps -pushd $PUSH_FILE_DIR -sudo sed -i "" 's/^ *validate_podspec//' push.rb -popd +for PUSH_FILE in $PUSH_FILES; do + echo "Patching $PUSH_FILE to validate podspec on iOS with no_subspecs and fail_fast..." + sudo sed -i "" "s/Validator.new(spec, \[repo_url\])/Validator.new(spec, [repo_url], ['ios']); validator.no_subspecs = true; validator.fail_fast = true/" "$PUSH_FILE" +done diff --git a/scripts/wait_for_pod_release.sh b/scripts/wait_for_pod_release.sh index 1e9cdc91f..1cac5171a 100755 --- a/scripts/wait_for_pod_release.sh +++ b/scripts/wait_for_pod_release.sh @@ -17,6 +17,7 @@ do echo "Version found!" break fi + sleep 30 done