Backport fixes from #26465 to v1.38.x#26466
Merged
jtattermusch merged 4 commits intogrpc:v1.38.xfrom Jun 15, 2021
Merged
Conversation
jtattermusch
added
release notes: no
Contributor
Author
apolcyn
approved these changes
Jun 14, 2021
Contributor
Author
|
The windows artifact build issue is currently also failing on upstream/master. https://fusion2.corp.google.com/invocations/9eca03d7-1191-41d8-943f-8ef62b15f0b7/targets/github%2Fgrpc;config=default/tests so that problem is unrelated on this PR. |
apolcyn
added a commit
that referenced
this pull request
Jun 17, 2021
* Bump version to v1.38.0-pre1 (#26208) * Bump version to v1.38.0-pre1 * Regenerate projects * [Backport][v1.38.x] Add EventEngine's port.h to the podspec (#26222) Backport of #26220 to v1.38.x. This is the only backport, since the EventEngine code was introduced after v1.37 was cut. This file is needed for the Objective-C cocoapod build. * fix xds resolver to add XdsClient to channel args even on errors (#26282) (#26288) Co-authored-by: Mark D. Roth <[email protected]> * Backport config update timeout change to v1.38.x (#26276) * Enable Traffic Director time tracer (#26111) * Just update the timeout (#26223) * Increase xds job timeouts (#26187) * Revert grpc_xds_k8s job timeouts back to 120 mins (#26219) * Revert grpc_xds_k8s_python timeout to 120mins (#26221) Seems to have been inadvertently increased in #26187 Co-authored-by: Eric Gribkoff <[email protected]> Co-authored-by: Yash Tibrewal <[email protected]> * Bump v1.38.x to v1.38.0 (#26317) * Bump version to v1.38.0 * Regenerate projects * Provide custom sponge configs to exclude manual runs from testgrid (#26283) (#26313) * Provide custom sponge configs * Correct the script * Allow test scripts to produce artifacts through Docker * Overcome the direcotry clone in our docker script * Expose TESTGRID_EXCLUDE and GIT_ORIGIN_URL through docker run * Make sanity tests happy * Revert "Provide custom sponge configs to exclude manual runs from testgrid (#26283) (#26313)" (#26324) This reverts commit 54dc182. * better way of building protoc aarch64 artifacts (#26423) * Backport #26430 and #26435 to v1.38.x (#26436) * workaround #26279 at the expense of binary compatibility * correctly tag aarch64 wheels as manylinux_2_24 * remove unnecessary comments left by #26430 * Backport #22964 into v1.38.x (#26448) * upgrade dotnet SDK 3 for C# build * add C# global.json * install dotnet SDK 3 on macos * upgrade C# docker images to debian buster * regenerate dockerfiles * Backport fixes from #26465 to v1.38.x (#26466) * switch remaining tests to C# buster image * remove C#'s global.json (which requires dotnet SDK 3+) * dotnet SDK3 currently breaks C# package build * regenerate dockerfiles Co-authored-by: Yash Tibrewal <[email protected]> Co-authored-by: AJ Heller <[email protected]> Co-authored-by: donnadionne <[email protected]> Co-authored-by: Mark D. Roth <[email protected]> Co-authored-by: Lidi Zheng <[email protected]> Co-authored-by: Eric Gribkoff <[email protected]> Co-authored-by: Jan Tattermusch <[email protected]>
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
4 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.
Bring fixes from #26465 into release branch as well.
Since the original PR was only reverted on the master branch, we don't need to re-introduce it into v1.38.x, but the followup fixes still need to make it into v1.38.x (e.g. to unbreak building packages on v1.38.x)