Merge pull request #15002 from mehrdada/upmerge-v1.11.0-rc2

Upmerge v1.11.x into master
reviewable/pr14886/r5
Mehrdad Afshari 7 years ago committed by GitHub
commit ee6e4dc784
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      PYTHON-MANIFEST.in
  2. 1
      tools/internal_ci/linux/grpc_build_packages.sh
  3. 7
      tools/run_tests/artifacts/build_package_ruby.sh

@ -4,10 +4,11 @@ graft src/python/grpcio/grpcio.egg-info
graft src/core
graft src/boringssl
graft include/grpc
graft third_party/address_sorting
graft third_party/boringssl
graft third_party/cares
graft third_party/nanopb
graft third_party/zlib
graft third_party/cares
include src/python/grpcio/_spawn_patch.py
include src/python/grpcio/commands.py
include src/python/grpcio/grpc_version.py

@ -30,6 +30,7 @@ set -ex
# where they can be accessed from within a docker container that builds
# the packages
mv ${KOKORO_GFILE_DIR}/github/grpc/artifacts input_artifacts || true
chmod +x input_artifacts/protoc*/* || true
ls -R input_artifacts || true
tools/run_tests/task_runner.py -f package linux -j 6

@ -53,8 +53,11 @@ for arch in {x86,x64}; do
output_dir="$base/src/ruby/tools/bin/${ruby_arch}-${plat}"
mkdir -p "$output_dir"/google/protobuf
mkdir -p "$output_dir"/google/protobuf/compiler # needed for plugin.proto
cp "$input_dir"/protoc* "$output_dir"/
cp "$input_dir"/grpc_ruby_plugin* "$output_dir"/
cp "$input_dir"/protoc* "$input_dir"/grpc_ruby_plugin* "$output_dir/"
if [[ "$plat" != "windows" ]]
then
chmod +x "$output_dir/protoc" "$output_dir/grpc_ruby_plugin"
fi
for proto in "${well_known_protos[@]}"; do
cp "$base/third_party/protobuf/src/google/protobuf/$proto.proto" "$output_dir/google/protobuf/$proto.proto"
done

Loading…
Cancel
Save