path tweask

jtattermusch · Jul 31, 2023 · 5db2dec · 5db2dec
1 parent 3dbb82d
commit 5db2dec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tools/internal_ci/windows/bazel_rbe.bat b/tools/internal_ci/windows/bazel_rbe.bat
@@ -44,6 +44,8 @@ bash -c "tools/bazel --version && cp tools/bazel-*.exe /c/bazel/bazel.exe"
 set PATH=C:\bazel;%PATH%
 bazel --version
 
+set PATH=C:\msys64\usr\bin;%PATH%
+
 python3 tools/run_tests/python_utils/bazel_report_helper.py --report_path bazel_rbe
 
-call bazel_rbe/bazel_wrapper.bat --bazelrc=tools/remote_build/windows.bazelrc --output_user_root=T:\_bazel_output test %BAZEL_FLAGS% --genrule_strategy=remote,local --workspace_status_command="bash tools/bazelify_tests/workspace_status_cmd.sh" -- //tools/bazelify_tests/test:win_from_linux || exit /b 1
+call bazel_rbe/bazel_wrapper.bat --bazelrc=tools/remote_build/windows.bazelrc --output_user_root=T:\_bazel_output test %BAZEL_FLAGS% --genrule_strategy=remote,local --action_env=PATH --workspace_status_command="bash tools/bazelify_tests/workspace_status_cmd.sh" -- //tools/bazelify_tests/test:win_from_linux || exit /b 1
diff --git a/tools/remote_build/windows.bazelrc b/tools/remote_build/windows.bazelrc
@@ -8,7 +8,7 @@ build --extra_execution_platforms=//third_party/toolchains:rbe_windows_default_p
 build --host_platform=//third_party/toolchains:rbe_windows_default_platform
 build --platforms=//third_party/toolchains:rbe_windows_default_platform
 # Needs to match the location of binaries in the RBE docker container
-build --shell_executable=c:/tools/msys64/usr/bin/bash.exe
+build --shell_executable=c:/msys64/usr/bin/bash.exe
 build --python_path="C:\\Program Files\\Python310\\python.exe"
 
 build --test_tag_filters=-no_windows