Merge remote-tracking branch 'upstream/main' into use-com_google_prot…

…obuf

.bazelci/presubmit.yml

@@ -145,6 +145,27 @@ tasks:
     <<: *common_workspace_flags
     name: "Default: Windows, workspace"
     platform: windows
+    # Most of tests/integration are failing on Windows w/workspace. Skip them
+    # for now until we can look into it.
+    build_targets:
+      - "--"
+      - "..."
+      # As a regression test for #225, check that wheel targets still build when
+      # their package path is qualified with the repo name.
+      - "@rules_python//examples/wheel/..."
+    build_flags:
+      - "--noenable_bzlmod"
+      - "--enable_workspace"
+      - "--keep_going"
+      - "--build_tag_filters=-integration-test"
+      - "--config=bazel7.x"
+    test_targets:
+      - "--"
+      - "..."
+    test_flags:
+      - "--noenable_bzlmod"
+      - "--enable_workspace"
+      - "--test_tag_filters=-integration-test"
 
   debian:
     <<: *reusable_config

tests/integration/local_toolchains/test.py

@@ -18,8 +18,9 @@ def test_python_from_path_used(self):
             [shell_path, "-c", "import sys; print(sys.executable)"],
             text=True,
         )
-        expected = expected.strip()
-        self.assertEqual(expected, sys.executable)
+        expected = expected.strip().lower()
+        # Normalize case: Windows may have case differences
+        self.assertEqual(expected.lower(), sys.executable.lower())
 
 
 if __name__ == "__main__":