Upmerge v1.47.x branch into master#30160
Merged
yashykt merged 10 commits intogrpc:masterfrom Jul 1, 2022
Merged
Conversation
* bump version to 1.47.0-pre1 * regenerate projects
…rpc#29850) * xDS: Workaround to get gRPC clients working with istio * Formatting * Comment test too * Disable instead of commenting
…) (grpc#29868) * Add support for prebuilt Ruby binary on x64-mingw-ucrt platform, which is used for Windows RubyInstaller Ruby 3.1+ Co-authored-by: Johnny Shields <johnny.shields@gmail.com>
…9857) (grpc#30026) * Attempt to set correct platform on Mac OS * Add some debug * Make it fail * Print more * Try again * Maybe it's an ordering issue? * Get logs back * Try copying distutils to see exactly what is being used * Actually export the variable * I just love debugging with CI * One directory higher this time * Try with an upgraded Python install * Fix version * Rebreak * Try setting it even earlier? * Unbreak * Try explicitly renaming the artifacts * Fix * I am about ready to start NAT hole punching for SSH * Break things for logs * Whoops * Clean up * Shellcheck
This Addresses the issue with skips not working in golang tests, ref b/235688697. 1. Unifies `TESTING_VERSION` detection in grpc_xds_k8s_install_test_driver.sh - new approach applicable to all languages. 2. Use `TESTING_VERSION` in all build files in `--testing_version` and when tagging docker images. This will be backported to all active test branches. Build Scripts in all other languages will be updated as well.
* bump version to 1.47.0 * regenerate projects
* tell MSVC to build grpc with utf-8 fix grpc#29979 * generate_projects Co-authored-by: AJ Heller <hork@google.com> Co-authored-by: AJ Heller <hork@google.com>
veblush
approved these changes
Jul 1, 2022
apolcyn
approved these changes
Jul 1, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Change was created by the release automation script. See go/grpc-release