DO NOT MERGE: tweaks

jtattermusch · Aug 3, 2023 · 35fca1a · 35fca1a
1 parent cef1928
commit 35fca1a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/bazel/grpc_extra_deps.bzl b/bazel/grpc_extra_deps.bzl
@@ -52,13 +52,13 @@ def grpc_extra_deps(ignore_version_differences = False):
 
     api_dependencies()
 
-    go_rules_dependencies()
-    go_register_toolchains(version = "1.18")
-    gazelle_dependencies()
+    #go_rules_dependencies()
+    #go_register_toolchains(version = "1.18")
+    #gazelle_dependencies()
 
     # Pull-in the go 3rd party dependencies for protoc_gen_validate, which is
     # needed for building C++ xDS protos
-    go_third_party()
+    #go_third_party()
 
     apple_rules_dependencies(ignore_version_differences = ignore_version_differences)
 

diff --git a/tools/bazelify_tests/test/BUILD b/tools/bazelify_tests/test/BUILD
@@ -163,10 +163,10 @@ sh_test(
         "win_from_linux.sh",
     ],
     data = [
-        "//tools/bazelify_tests:grpc_repo_archive_with_submodules.tar.gz"
+        #"//tools/bazelify_tests:grpc_repo_archive_with_submodules.tar.gz"
     ],
     args = [
-        "$(location //tools/bazelify_tests:grpc_repo_archive_with_submodules.tar.gz)",
+        #"$(location //tools/bazelify_tests:grpc_repo_archive_with_submodules.tar.gz)",
     ],
     exec_properties = {
         "dockerNetwork": "standard",  # TODO(jtattermusch): look into deactivating network for some actions
@@ -175,6 +175,9 @@ sh_test(
         "container-image": "docker://gcr.io/grpc-testing/rbe_windows2019@sha256:41772e8eeb9dd8c8b996bf32d58164d84b2315c8e81e634bbff5a0216b7f52fd",
         "OSFamily": "Windows",
     },
+    env = {
+        "PATH": "C:\\msys64\\usr\\bin;C:\\tools\\msys64\\usr\\bin;C:\\Python37"
+    }
 )
 
 # sh_binary(

diff --git a/tools/remote_build/include/rbe_remote_execution.bazelrc b/tools/remote_build/include/rbe_remote_execution.bazelrc
@@ -31,6 +31,6 @@ build --remote_timeout=7200  # very large value to avoid problems like https://g
 build --define GRPC_PORT_ISOLATED_RUNTIME=1
 
 # Prevents host environment variables from leaking into Bazel actions and ensures that the remote cache is shared across machines
-#build --incompatible_strict_action_env=true
+build --incompatible_strict_action_env=true
 # TODO(jtattermusch): is this still required for remote execution to work?
 build --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
diff --git a/tools/remote_build/windows.bazelrc b/tools/remote_build/windows.bazelrc
@@ -9,7 +9,11 @@ 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:/msys64/usr/bin/bash.exe
-build --python_path="C:\\Program Files\\Python310\\python.exe"
+#build --shell_executable=/c/msys64/usr/bin
+#build --python_path="C:\\Program Files\\Python310\\python.exe"
+
+
+build --incompatible_enable_cc_toolchain_resolution
 
 build --test_tag_filters=-no_windows
 build --build_tag_filters=-no_windows