Fixup workspace

Author: pjreiniger

.bazelrc

@@ -18,16 +18,6 @@ build:systemcore --platforms=@rules_bzlmodrio_toolchains//platforms/systemcore
 build:systemcore --build_tag_filters=-no-systemcore
 build:systemcore --platform_suffix=systemcore
 
-# bullseye32
-build:bullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye32
-build:bullseye32 --build_tag_filters=-no-bullseye32
-build:bullseye32 --platform_suffix=bullseye32
-
-# bullseye64
-build:bullseye64 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye64
-build:bullseye64 --build_tag_filters=-no-bullseye64
-build:bullseye64 --platform_suffix=bullseye64
-
 # bookworm32
 build:bookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm32
 build:bookworm32 --build_tag_filters=-no-bookworm32
@@ -38,19 +28,14 @@ build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
 build:bookworm64 --build_tag_filters=-no-bookworm64
 build:bookworm64 --platform_suffix=bookworm64
 
-# raspibullseye32
-build:raspibullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibullseye32
-build:raspibullseye32 --build_tag_filters=-no-raspibullseye32
-build:raspibullseye32 --platform_suffix=raspibullseye32
-
-# raspibookworm32
-build:raspibookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibookworm32
-build:raspibookworm32 --build_tag_filters=-no-raspibookworm32
-build:raspibookworm32 --platform_suffix=raspibookworm32
+# rpbookworm32
+build:rpbookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/rpbookworm32
+build:rpbookworm32 --build_tag_filters=-no-rpbookworm32
+build:rpbookworm32 --platform_suffix=rpbookworm32
 
 # Alias toolchain names to what wpilibsuite uses for CI/Artifact naming
 build:athena --config=roborio
-build:linuxarm32 --config=raspibookworm32
+build:linuxarm32 --config=rpbookworm32
 build:linuxarm64 --config=bookworm64
 
 test --test_output=errors

.github/workflows/lint.yml

@@ -12,10 +12,10 @@ jobs:
     name: "buildifier"
     runs-on: ubuntu-22.04
     steps:
-      - name: Set up Go 1.20.x
-        uses: actions/setup-go@v5
+      - name: Set up Go
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.20.x
+          go-version: "1.25"
           cache: false
         id: go
 

private/cpp/opencv/BUILD.bazel

@@ -21,10 +21,10 @@ alias(
             "@rules_bzlmodrio_toolchains//conditions:windows_x86_64_debug": "@edu_wpi_opencv-cpp_windowsx86-64debug//:" + lib + extension,
             "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": "@edu_wpi_opencv-cpp_linuxarm64//:" + lib + extension,
             "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": "@edu_wpi_opencv-cpp_linuxarm64debug//:" + lib + extension,
-            "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32": "@edu_wpi_opencv-cpp_linuxarm32//:" + lib + extension,
-            "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32_debug": "@edu_wpi_opencv-cpp_linuxarm32debug//:" + lib + extension,
             "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": "@edu_wpi_opencv-cpp_linuxathena//:" + lib + extension,
             "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio_debug": "@edu_wpi_opencv-cpp_linuxathenadebug//:" + lib + extension,
+            "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32": "@edu_wpi_opencv-cpp_linuxarm32//:" + lib + extension,
+            "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32_debug": "@edu_wpi_opencv-cpp_linuxarm32debug//:" + lib + extension,
             "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore": "@edu_wpi_opencv-cpp_linuxsystemcore//:" + lib + extension,
             "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore_debug": "@edu_wpi_opencv-cpp_linuxsystemcoredebug//:" + lib + extension,
         }),
@@ -49,10 +49,10 @@ alias(
         "@rules_bzlmodrio_toolchains//conditions:windows_x86_64_debug": "@edu_wpi_opencv-cpp_windowsx86-64debug//:static",
         "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": "@edu_wpi_opencv-cpp_linuxarm64//:static",
         "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": "@edu_wpi_opencv-cpp_linuxarm64debug//:static",
-        "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32": "@edu_wpi_opencv-cpp_linuxarm32//:static",
-        "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32_debug": "@edu_wpi_opencv-cpp_linuxarm32debug//:static",
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": "@edu_wpi_opencv-cpp_linuxathena//:static",
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio_debug": "@edu_wpi_opencv-cpp_linuxathenadebug//:static",
+        "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32": "@edu_wpi_opencv-cpp_linuxarm32//:static",
+        "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32_debug": "@edu_wpi_opencv-cpp_linuxarm32debug//:static",
         "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore": "@edu_wpi_opencv-cpp_linuxsystemcore//:static",
         "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore_debug": "@edu_wpi_opencv-cpp_linuxsystemcoredebug//:static",
     }),
@@ -72,10 +72,10 @@ cc_library(
         "@rules_bzlmodrio_toolchains//conditions:windows_x86_64_debug": ["@edu_wpi_opencv-cpp_windowsx86-64debug//:jni"],
         "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@edu_wpi_opencv-cpp_linuxarm64//:jni"],
         "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@edu_wpi_opencv-cpp_linuxarm64debug//:jni"],
-        "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32": ["@edu_wpi_opencv-cpp_linuxarm32//:jni"],
-        "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32_debug": ["@edu_wpi_opencv-cpp_linuxarm32debug//:jni"],
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": ["@edu_wpi_opencv-cpp_linuxathena//:jni"],
         "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio_debug": ["@edu_wpi_opencv-cpp_linuxathenadebug//:jni"],
+        "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32": ["@edu_wpi_opencv-cpp_linuxarm32//:jni"],
+        "@rules_bzlmodrio_toolchains//constraints/is_rpbookworm32:rpbookworm32_debug": ["@edu_wpi_opencv-cpp_linuxarm32debug//:jni"],
         "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore": ["@edu_wpi_opencv-cpp_linuxsystemcore//:jni"],
         "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore_debug": ["@edu_wpi_opencv-cpp_linuxsystemcoredebug//:jni"],
     }),

tests/.bazelrc

@@ -18,16 +18,6 @@ build:systemcore --platforms=@rules_bzlmodrio_toolchains//platforms/systemcore
 build:systemcore --build_tag_filters=-no-systemcore
 build:systemcore --platform_suffix=systemcore
 
-# bullseye32
-build:bullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye32
-build:bullseye32 --build_tag_filters=-no-bullseye32
-build:bullseye32 --platform_suffix=bullseye32
-
-# bullseye64
-build:bullseye64 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye64
-build:bullseye64 --build_tag_filters=-no-bullseye64
-build:bullseye64 --platform_suffix=bullseye64
-
 # bookworm32
 build:bookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm32
 build:bookworm32 --build_tag_filters=-no-bookworm32
@@ -38,19 +28,14 @@ build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
 build:bookworm64 --build_tag_filters=-no-bookworm64
 build:bookworm64 --platform_suffix=bookworm64
 
-# raspibullseye32
-build:raspibullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibullseye32
-build:raspibullseye32 --build_tag_filters=-no-raspibullseye32
-build:raspibullseye32 --platform_suffix=raspibullseye32
-
-# raspibookworm32
-build:raspibookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibookworm32
-build:raspibookworm32 --build_tag_filters=-no-raspibookworm32
-build:raspibookworm32 --platform_suffix=raspibookworm32
+# rpbookworm32
+build:rpbookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/rpbookworm32
+build:rpbookworm32 --build_tag_filters=-no-rpbookworm32
+build:rpbookworm32 --platform_suffix=rpbookworm32
 
 # Alias toolchain names to what wpilibsuite uses for CI/Artifact naming
 build:athena --config=roborio
-build:linuxarm32 --config=raspibookworm32
+build:linuxarm32 --config=rpbookworm32
 build:linuxarm64 --config=bookworm64
 
 test --test_output=errors

tests/MODULE.bazel

@@ -9,7 +9,7 @@ bazel_dep(name = "rules_cc", version = "0.1.4")
 bazel_dep(name = "rules_java", version = "8.11.0")
 bazel_dep(name = "rules_jvm_external", version = "6.3")
 bazel_dep(name = "rules_bazelrio", version = "0.0.14")
-bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr5")
+bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr7")
 bazel_dep(name = "rules_bzlmodrio_jdk", version = "17.0.12-7.bcr1")
 
 # TODO replace with released version once they make one that has Austins patch