Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #22964 into v1.38.x #26448

Merged
merged 5 commits into from
Jun 9, 2021
Merged

Conversation

jtattermusch
Copy link
Contributor

@jtattermusch jtattermusch commented Jun 8, 2021

Backports #22964.

Looks like this will be necessary for being able to build the interop_matrix docker image for C# (see the issue mentioned here: #26411 (comment)) for the 1.38.x release.

@jtattermusch jtattermusch added the release notes: no Indicates if PR should not be in release notes label Jun 8, 2021
@jtattermusch
Copy link
Contributor Author

Once this is part of a release tag (I think that's going to be 1.38.1 patch release), I can update the interop matrix accordingly.

@jtattermusch jtattermusch merged commit 6b1fab7 into grpc:v1.38.x Jun 9, 2021
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 <roth@google.com>

* 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 <ericgribkoff@google.com>
Co-authored-by: Yash Tibrewal <yashkt@google.com>

* 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 <yashkt@google.com>
Co-authored-by: AJ Heller <hork@google.com>
Co-authored-by: donnadionne <donnadionne@google.com>
Co-authored-by: Mark D. Roth <roth@google.com>
Co-authored-by: Lidi Zheng <lidiz@google.com>
Co-authored-by: Eric Gribkoff <ericgribkoff@google.com>
Co-authored-by: Jan Tattermusch <jtattermusch@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release notes: no Indicates if PR should not be in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants