More

Author: Bencodes

.bcr/presubmit.yml

@@ -2,7 +2,7 @@ bcr_test_module:
   module_path: "e2e/smoke"
   matrix:
     platform: ["debian11", "macos", "ubuntu2204", "windows"]
-    bazel: ["8.x", "7.x", "6.x"]
+    bazel: ["9.x", "8.x", "7.x"]
   tasks:
     run_tests:
       name: "Run test module"

.devcontainer/Dockerfile

@@ -25,7 +25,8 @@ jobs:
       exclude: |
         [
           {"folder": ".", "bzlmodEnabled": false},
-          {"folder": ".", "bazelVersion": "6.4.0"}
+          {"folder": ".", "bazelVersion": "6.4.0"},
+          {"folder": "e2e/smoke", "bazelVersion": "6.4.0"}
         ]
   pre-commit:
     runs-on: ubuntu-latest

.devcontainer/devcontainer.json

@@ -5,6 +5,8 @@
 # Commitizen runs in commit-msg stage
 # but we don't want to run the other hooks on commit messages
 default_stages: [pre-commit]
+# Keep the pinned maven lockfile byte-for-byte as generated.
+exclude: ^maven_install\.json$
 # Use a slightly older version of node by default
 # as the default uses a very new version of GLIBC
 default_language_version:

.github/workflows/ci.yaml

@@ -1,10 +1,95 @@
-"""Provides a simple way to test rule installation as an external workspace."""
+"""Smoke tests for rules_detekt as an external dependency."""
 
-load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
+load("@rules_detekt//detekt:defs.bzl", "detekt_test")
 
-filegroup(name = "empty")
+detekt_test(
+    name = "detekt_happy_target",
+    srcs = glob(["src/main/kotlin/**/*.kt"]),
+    cfgs = ["detekt_config_lenient.yml"],
+    tags = ["manual"],
+)
+
+detekt_test(
+    name = "detekt_failing_target",
+    srcs = glob(["src/main/kotlin/**/*.kt"]),
+    tags = ["manual"],
+)
+
+genrule(
+    name = "detekt_happy_exit_code_actual",
+    testonly = 1,
+    srcs = [":detekt_happy_target"],
+    outs = ["detekt_happy_exit_code.actual"],
+    cmd = """
+set -e
+for f in $(SRCS); do
+  case "$$f" in
+    *_exit_code.txt)
+      cp "$$f" "$@"
+      exit 0
+      ;;
+  esac
+done
+echo "Could not locate Detekt exit code output for detekt_happy_target" >&2
+exit 1
+""",
+    cmd_bat = """
+@echo off
+setlocal EnableExtensions EnableDelayedExpansion
+for %%f in ($(SRCS)) do (
+  echo %%~nxf | findstr /R "_exit_code.txt$" >nul
+  if !ERRORLEVEL! EQU 0 (
+    copy /Y "%%f" "%OUTS%" >nul
+    exit /b 0
+  )
+)
+echo Could not locate Detekt exit code output for detekt_happy_target 1>&2
+exit /b 1
+""",
+)
+
+genrule(
+    name = "detekt_failure_exit_code_actual",
+    testonly = 1,
+    srcs = [":detekt_failing_target"],
+    outs = ["detekt_failure_exit_code.actual"],
+    cmd = """
+set -e
+for f in $(SRCS); do
+  case "$$f" in
+    *_exit_code.txt)
+      cp "$$f" "$@"
+      exit 0
+      ;;
+  esac
+done
+echo "Could not locate Detekt exit code output for detekt_failing_target" >&2
+exit 1
+""",
+    cmd_bat = """
+@echo off
+setlocal EnableExtensions EnableDelayedExpansion
+for %%f in ($(SRCS)) do (
+  echo %%~nxf | findstr /R "_exit_code.txt$" >nul
+  if !ERRORLEVEL! EQU 0 (
+    copy /Y "%%f" "%OUTS%" >nul
+    exit /b 0
+  )
+)
+echo Could not locate Detekt exit code output for detekt_failing_target 1>&2
+exit /b 1
+""",
+)
+
+diff_test(
+    name = "detekt_happy_path_test",
+    file1 = ":detekt_happy_exit_code_actual",
+    file2 = "expected_happy_exit_code.txt",
+)
 
-build_test(
-    name = "smoke_test",
-    targets = [":empty"],
+diff_test(
+    name = "detekt_failure_path_test",
+    file1 = ":detekt_failure_exit_code_actual",
+    file2 = "expected_failure_exit_code.txt",
 )

.pre-commit-config.yaml

@@ -1,4 +1,8 @@
 # smoke test
 
 This e2e workspace exercises repository install/setup from an end-user perspective.
-It catches mistakes in install instructions and BCR metadata.
+
+It contains two end-to-end Detekt checks:
+
+- `detekt_happy_path_test`: verifies a configured target succeeds.
+- `detekt_failure_path_test`: verifies Detekt violations are reported (non-zero exit code).

e2e/smoke/BUILD

@@ -9,6 +9,18 @@ local_repository(
 ######################
 # rules_detekt setup #
 ######################
+# Fetch bazel_skylib for smoke tests.
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "bazel_skylib",
+    sha256 = "6e78f0e57de26801f6f564fa7c4a48dc8b36873e416257a92bbb0937eeac8446",
+    urls = [
+        "https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.2/bazel-skylib-1.8.2.tar.gz",
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.8.2/bazel-skylib-1.8.2.tar.gz",
+    ],
+)
+
 # Fetches the rules_detekt dependencies.
 # If you want to have a different version of some dependency,
 # you should fetch it *before* calling this.

e2e/smoke/MODULE.bazel.lock

@@ -0,0 +1,2 @@
+build:
+  maxIssues: 10