Imported Upstream version 1.34.0

[platform/upstream/grpc.git] / tools / internal_ci / windows / grpc_build_artifacts.bat

diff --git a/tools/internal_ci/windows/grpc_build_artifacts.bat b/tools/internal_ci/windows/grpc_build_artifacts.bat
index 0e02bdb..b8901e3 100644 (file)
--- a/tools/internal_ci/windows/grpc_build_artifacts.bat
+++ b/tools/internal_ci/windows/grpc_build_artifacts.bat
@@ -12,18 +12,15 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 
-@rem Move python installation from _32bit to _32bits where they are expected by python artifact builder
-@rem TODO(jtattermusch): get rid of this hack
-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 Boringssl build no longer supports yasm
+choco uninstall yasm -y --limit-output
+choco install nasm -y --limit-output
 
 @rem enter repo root
 cd /d %~dp0\..\..\..
 
-call tools/internal_ci/helper_scripts/prepare_build_windows.bat
+set PREPARE_BUILD_INSTALL_DEPS_PYTHON=true
+call tools/internal_ci/helper_scripts/prepare_build_windows.bat || exit /b 1
 
 python tools/run_tests/task_runner.py -f artifact windows -j 4
 set RUNTESTS_EXITCODE=%errorlevel%