Fix typo in toolchains.bzl (#169)

buildfoundation · Oct 10, 2023 · 26bdcd1 · 26bdcd1
1 parent b8a6659
commit 26bdcd1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
       - name: "Lint Shell files"
         run: for file in $(ind . -type f -name "*.sh" -not -path "./.github/*"); do shellcheck $file; done;
 
-  build:
+  build-bzlmod:
     runs-on: ubuntu-latest
     steps:
       - name: "Checkout the sources"
@@ -39,8 +39,26 @@ jobs:
       - name: "Configure Bazel"
         run: cp .github/workflows/ci.bazelrc .
       - name: "Build"
-        run: bazel build //detekt/wrapper:bin
+        run: bazel build //detekt/wrapper:bin --enable_bzlmod=True
       - name: "Unit tests"
-        run: bazel test //...
+        run: bazel test //... --enable_bzlmod=True
       - name: "Integration tests"
         run: bash tests/integration/suite.sh
+  build-workspace:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Checkout the sources"
+        uses: actions/checkout@v4
+      - name: "Install JDK 11"
+        uses: actions/setup-java@v3
+        with:
+          distribution: "zulu"
+          java-version: "11"
+      - name: "Setup Bazelisk"
+        uses: bazelbuild/setup-bazelisk@v2
+      - name: "Configure Bazel"
+        run: cp .github/workflows/ci.bazelrc .
+      - name: "Build"
+        run: bazel build //detekt/wrapper:bin --enable_bzlmod=False
+      - name: "Unit tests"
+        run: bazel test //detekt/... --enable_bzlmod=False
diff --git a/detekt/toolchains.bzl b/detekt/toolchains.bzl
@@ -3,7 +3,6 @@ Macros for defining toolchains.
 See https://docs.bazel.build/versions/master/skylark/deploying.html#registering-toolchains
 """
 
-load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 load("@rules_jvm_external//:specs.bzl", "maven")
 
@@ -17,10 +16,6 @@ def rules_detekt_toolchains(toolchain = "@rules_detekt//detekt:default_toolchain
     Args:
         toolchain: `detekt_toolchain` used by rules.
     """
-
-    rules_java_dependencies()
-    rules_java_toolchains()
-
     native.register_toolchains(toolchain)
 
     maven_install(
@@ -30,7 +25,7 @@ def rules_detekt_toolchains(toolchain = "@rules_detekt//detekt:default_toolchain
             maven.artifact("com.squareup.okio", "okio-jvm", "3.2.0"),
             maven.artifact("io.reactivex.rxjava3", "rxjava", "3.0.12"),
             maven.artifact("junit", "junit", "4.13.2", testonly = True),
-            maevn.artifact("io.gitlab.arturbosch.detekt", "detekt-cli", "1.23.1", testonly = True),
+            maven.artifact("io.gitlab.arturbosch.detekt", "detekt-cli", "1.23.1", testonly = True),
         ],
         repositories = [
             "https://repo1.maven.org/maven2",