More fixes for BCR (#310)

* More fixes for BCR

Fixes for E2e tests for the BCR

* updates

* version

Author: tinder-maxwellelliott

.bcr/presubmit.yml

@@ -8,30 +8,36 @@ tasks:
     name: Verify build targets (Debian 10)
     platform: debian10
     bazel: ${{ bazel }}
+    build_flags:
+    - '--cxxopt=-std=c++17'
+    - '--host_cxxopt=-std=c++17'
     build_targets:
     - '@bazel-diff//:bazel-diff'
   verify_targets_ubuntu2004:
     name: Verify build targets (Ubuntu 20.04)
     platform: ubuntu2004
     bazel: ${{ bazel }}
-    build_targets:
-    - '@bazel-diff//:bazel-diff'
-  verify_targets_macos:
-    name: Verify build targets (macOS)
-    platform: macos
-    bazel: ${{ bazel }}
+    build_flags:
+    - '--cxxopt=-std=c++17'
+    - '--host_cxxopt=-std=c++17'
     build_targets:
     - '@bazel-diff//:bazel-diff'
   verify_targets_macos_arm64:
     name: Verify build targets (macOS ARM64)
     platform: macos_arm64
     bazel: ${{ bazel }}
+    build_flags:
+    - '--cxxopt=-std=c++17'
+    - '--host_cxxopt=-std=c++17'
     build_targets:
     - '@bazel-diff//:bazel-diff'
   verify_targets_windows_7x:
     name: Verify build targets (Windows, Bazel 7.x)
     platform: windows
     bazel: "7.x"
+    build_flags:
+    - '--cxxopt=-std=c++17'
+    - '--host_cxxopt=-std=c++17'
     build_targets:
     - '@bazel-diff//:bazel-diff'
   verify_targets_windows_8x:
@@ -40,6 +46,8 @@ tasks:
     bazel: "8.x"
     build_flags:
     - '--legacy_external_runfiles'
+    - '--cxxopt=-std=c++17'
+    - '--host_cxxopt=-std=c++17'
     build_targets:
     - '@bazel-diff//:bazel-diff'
   verify_targets_windows_9x:
@@ -48,14 +56,15 @@ tasks:
     bazel: "9.x"
     build_flags:
     - '--legacy_external_runfiles'
+    - '--cxxopt=-std=c++17'
+    - '--host_cxxopt=-std=c++17'
     build_targets:
     - '@bazel-diff//:bazel-diff'
 bcr_test_module:
   module_path: ""
   matrix:
     platform:
     - ubuntu2004
-    - macos
     - macos_arm64
     bazel:
     - 8.x
@@ -65,5 +74,8 @@ bcr_test_module:
       name: Run test
       platform: ${{ platform }}
       bazel: ${{ bazel }}
+      build_flags:
+      - '--cxxopt=-std=c++17'
+      - '--host_cxxopt=-std=c++17'
       test_targets:
       - '//cli/...'

MODULE.bazel

@@ -1,6 +1,6 @@
 module(
     name = "bazel-diff",
-    version = "15.0.1",
+    version = "15.0.2",
     compatibility_level = 0,
 )
 

MODULE.bazel.lock

@@ -22,6 +22,7 @@ class E2ETest {
     return targets.filter { target ->
       // Filter out bazel-diff's own internal test targets
       !target.contains("bazel-diff-integration-tests") &&
+      !target.contains("@@//:BUILD") &&
       !target.contains("bazel_diff_maven") // Filter out bazel-diff's maven dependencies
     }.toSet()
   }
@@ -695,9 +696,13 @@ class E2ETest {
     val gson = Gson()
     val shape = object : TypeToken<List<Map<String, Any>>>() {}.type
     val actual =
-        gson.fromJson<List<Map<String, Any>>>(impactedTargetsOutput.readText(), shape).sortedBy {
-          it["label"] as String
-        }
+        gson.fromJson<List<Map<String, Any>>>(impactedTargetsOutput.readText(), shape)
+            .filter { target ->
+              // Filter out Bazel convenience symlink targets (bazel-*) as they're not reliably
+              // present across all environments
+              !(target["label"] as String).contains("//bazel-")
+            }
+            .sortedBy { it["label"] as String }
     val expected: List<Map<String, Any>> =
         listOf(
             mapOf("label" to "//A:one", "targetDistance" to 0.0, "packageDistance" to 0.0),

cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt

@@ -1,3 +1,5 @@
+load("@rules_shell//shell:sh_binary.bzl", "sh_binary")
+load("@rules_shell//shell:sh_library.bzl", "sh_library")
 
 sh_binary(
     name = "one",

cli/src/test/resources/fixture/cquery-test-android-code-change.zip

@@ -1,3 +1,4 @@
+load("@rules_shell//shell:sh_library.bzl", "sh_library")
 
 sh_library(
     name = "lib",

cli/src/test/resources/fixture/cquery-test-base.zip

@@ -0,0 +1,7 @@
+module(
+    name = "distance_metrics_integration",
+    version = "0.0.0",
+)
+
+bazel_dep(name = "bazel_skylib", version = "1.9.0")
+bazel_dep(name = "rules_shell", version = "0.4.0")