diff options
| author |  Mehrdad Afshari <mehrdada@users.noreply.github.com> | 2018-08-07 15:00:29 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-08-07 15:00:29 -0700 |
| commit | 6ce3f20d23c36372a5e8488ba1ffd1c943e11647 (patch) | |
| tree | 1289f62f48130b75c43605bff743be0f7a9e24b3 /tools/internal_ci | |
| parent | 6c3aa171f49e104356508eb3427b8671119cedfe (diff) | |
| parent | 158eeee2dd4e15dc2608d02e056ec467473a1683 (diff) | |
Merge pull request #16256 from mehrdada/upmerge1.14.x
Upmerge 1.14.x into master
Diffstat (limited to 'tools/internal_ci')
| -rw-r--r-- | tools/internal_ci/helper_scripts/prepare_build_windows.bat | 5 | ||||
| -rw-r--r-- | tools/internal_ci/windows/grpc_build_artifacts.bat | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tools/internal_ci/helper_scripts/prepare_build_windows.bat b/tools/internal_ci/helper_scripts/prepare_build_windows.bat index 0164e4a561..f987f8a8cb 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_windows.bat +++ b/tools/internal_ci/helper_scripts/prepare_build_windows.bat @@ -14,7 +14,7 @@ @rem make sure msys binaries are preferred over cygwin binaries @rem set path to python 2.7 -set PATH=C:\tools\msys64\usr\bin;C:\Python27;C:\Python37;%PATH% +set PATH=C:\tools\msys64\usr\bin;C:\Python27;%PATH% @rem If this is a PR using RUN_TESTS_FLAGS var, then add flags to filter tests if defined KOKORO_GITHUB_PULL_REQUEST_NUMBER if defined RUN_TESTS_FLAGS ( @@ -34,9 +34,6 @@ netsh interface ip add dnsservers "Local Area Connection 8" 8.8.4.4 index=3 @rem Needed for big_query_utils python -m pip install google-api-python-client -@rem Install Python 3.7 -chocolatey install -y -r python3 --version 3.7 - @rem Disable some unwanted dotnet options set NUGET_XMLDOC_MODE=skip set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true diff --git a/tools/internal_ci/windows/grpc_build_artifacts.bat b/tools/internal_ci/windows/grpc_build_artifacts.bat index 4d528e0128..0e02bdb6ec 100644 --- a/tools/internal_ci/windows/grpc_build_artifacts.bat +++ b/tools/internal_ci/windows/grpc_build_artifacts.bat @@ -18,6 +18,7 @@ rename C:\Python27_32bit Python27_32bits rename C:\Python34_32bit Python34_32bits rename C:\Python35_32bit Python35_32bits rename C:\Python36_32bit Python36_32bits +rename C:\Python37_32bit Python37_32bits @rem enter repo root cd /d %~dp0\..\..\.. |