Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion gRPC-C++.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion gRPC-Core.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion gRPC-ProtoRPC.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion gRPC-RxLibrary.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion gRPC.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions include/grpcpp/version_info.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions scripts/release_cocoapod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
28 changes: 14 additions & 14 deletions scripts/skip_pod_push_lint.sh
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions scripts/wait_for_pod_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ do
echo "Version found!"
break
fi
sleep 30
done


Expand Down
2 changes: 1 addition & 1 deletion src/objective-c/!ProtoCompiler-gRPCCppPlugin.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/objective-c/!ProtoCompiler-gRPCPlugin.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/objective-c/GRPCClient/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Loading