Try again

snobotsim · Jul 7, 2024 · d24b253 · d24b253
1 parent 301a29b
commit d24b253
Show file tree

Hide file tree

Showing 6 changed files with 145 additions and 2 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,7 +1,7 @@
 try-import %workspace%/user.bazelrc
 
 build --java_language_version=17
-build --java_runtime_version=remotejdk_17
+build --java_runtime_version=roboriojdk_17
 build --tool_java_language_version=11
 build --tool_java_runtime_version=remotejdk_11
 

diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { os: ubuntu-latest, architecture: x64, config: "--config=for-roborio" }
+          - { os: ubuntu-latest, architecture: x64, config: "--config=for-roborio --noenable_bzlmod" }
           - { os: ubuntu-latest, architecture: x64, config: "--config=for-roborio --enable_bzlmod" }
     name: "Build - ${{ matrix.os }} ${{ matrix.architecture }} ${{ matrix.config }}"
     runs-on: ${{ matrix.os }}

diff --git a/.github/workflows/lint_format.yml b/.github/workflows/lint_format.yml
@@ -46,6 +46,9 @@ jobs:
         if: ${{ failure() }}
 
   buildifier:
+    name: "buildifier"
+    runs-on: ubuntu-latest
+    steps:
       - name: Set up Go 1.15.x
         uses: actions/setup-go@v5
         with:
@@ -72,6 +75,9 @@ jobs:
         if: ${{ failure() }}
 
   spotless:
+    name: "spotless"
+    runs-on: ubuntu-latest
+    steps:
     # Run formatters
       - name: Run Spotless
         run: ./gradlew spotlessApply
@@ -91,6 +97,9 @@ jobs:
         if: ${{ failure() }}
 
   unused_deps:
+    name: "unused deps"
+    runs-on: ubuntu-latest
+    steps:
       - name: Set up Go 1.15.x
         uses: actions/setup-go@v5
         with:

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -2,6 +2,7 @@ bazel_dep(name = "rules_jvm_external", version = "6.1")
 bazel_dep(name = "rules_java", version = "7.6.1")
 bazel_dep(name = "rules_bazelrio", version = "0.0.14")
 bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1")
+bazel_dep(name = "rules_bzlmodrio_jdk", version = "17.0.8.1-1")
 bazel_dep(name = "rules_pmd", version = "7.2.0")
 bazel_dep(name = "bzlmodrio-allwpilib", version = "2024.3.2")
 bazel_dep(name = "bzlmodrio-navx", version = "2024.1.0")