From 669ddd247f9ae666a95254da3835d150e589f5f8 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Wed, 1 Jan 2025 05:27:59 -0500 Subject: [PATCH 1/3] Update to 2025.4.10.0-3 --- .bazelrc | 19 +- .bazelrc-cc | 13 +- MODULE.bazel | 6 +- libraries/cpp/opencv/BUILD.bazel | 4 - maven_cpp_deps.bzl | 196 ++++---- maven_java_deps.bzl | 4 +- private/cpp/opencv/BUILD.bazel | 42 +- .../download_dependencies.bzl | 5 +- .../setup_dependencies.bzl | 9 +- tests/.bazelrc | 19 +- tests/.bazelrc-cc | 13 +- tests/MODULE.bazel | 12 + tests/MODULE.bazel.lock | 424 +++++++++++------- 13 files changed, 452 insertions(+), 314 deletions(-) diff --git a/.bazelrc b/.bazelrc index 280ffcb..224e3f7 100644 --- a/.bazelrc +++ b/.bazelrc @@ -33,10 +33,21 @@ build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64 build:bookworm64 --build_tag_filters=-no-bookworm build:bookworm64 --platform_suffix=bookworm64 -# rasppi -build:raspi32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspi32 -build:raspi32 --build_tag_filters=-no-raspi -build:raspi32 --platform_suffix=raspi32 +# rasppi bullseye +build:raspibullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibullseye32 +build:raspibullseye32 --build_tag_filters=-no-raspi +build:raspibullseye32 --platform_suffix=raspibullseye32 + +# rasppi bookworm +build:raspibookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibookworm32 +build:raspibookworm32 --build_tag_filters=-no-raspi +build:raspibookworm32 --platform_suffix=raspibookworm32 + +# Alias toolchain names to what wpilibsuite uses for CI/Artifact naming +build:athena --config=roborio +build:systemcore --config=bookworm64 +build:linuxarm32 --config=raspibookworm32 +build:linuxarm64 --config=bookworm64 test --test_output=errors common --registry=https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/ diff --git a/.bazelrc-cc b/.bazelrc-cc index cfbe70b..aafcf41 100644 --- a/.bazelrc-cc +++ b/.bazelrc-cc @@ -65,7 +65,12 @@ build:bookworm64 --incompatible_enable_cc_toolchain_resolution build:bookworm64 --copt=-std=c++20 build:bookworm64 --features=compiler_param_file -# rasppi -build:raspi32 --incompatible_enable_cc_toolchain_resolution -build:raspi32 --copt=-std=c++20 -build:raspi32 --features=compiler_param_file +# rasppi bullseye +build:raspibullseye32 --incompatible_enable_cc_toolchain_resolution +build:raspibullseye32 --copt=-std=c++20 +build:raspibullseye32 --features=compiler_param_file + +# rasppi bookworm +build:raspibookworm32 --incompatible_enable_cc_toolchain_resolution +build:raspibookworm32 --copt=-std=c++20 +build:raspibookworm32 --features=compiler_param_file diff --git a/MODULE.bazel b/MODULE.bazel index 1815444..11cb26e 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,6 @@ module( name = "bzlmodrio-opencv", - version = "2025.4.10.0-2", + version = "2025.4.10.0-3", compatibility_level = 2025, ) @@ -41,6 +41,10 @@ use_repo( "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversaldebug", "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversalstatic", "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversalstaticdebug", + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64", + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64debug", + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64static", + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64staticdebug", "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_sources", "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64", "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64debug", diff --git a/libraries/cpp/opencv/BUILD.bazel b/libraries/cpp/opencv/BUILD.bazel index ead34fc..bc927d6 100644 --- a/libraries/cpp/opencv/BUILD.bazel +++ b/libraries/cpp/opencv/BUILD.bazel @@ -23,10 +23,6 @@ alias( alias( name = "shared", actual = "@bzlmodrio-opencv//private/cpp/opencv:shared", - target_compatible_with = select({ - "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"], - "//conditions:default": [], - }), visibility = ["//visibility:public"], ) diff --git a/maven_cpp_deps.bzl b/maven_cpp_deps.bzl index 071d106..73a5e7f 100644 --- a/maven_cpp_deps.bzl +++ b/maven_cpp_deps.bzl @@ -26,295 +26,323 @@ def __setup_bzlmodrio_opencv_cpp_dependencies(mctx): maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_headers", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-headers.zip", - sha256 = "c6f5a2f3082b96d0c456e499aa7d5ad24fcad89c11dd6259e6709057fafa798d", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-headers.zip", + sha256 = "b5b7c4a73300b71b96569a26041bc59702b6d4974e60725a569e2d50b140d65e", build_file_content = cc_library_headers, ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_sources", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-sources.zip", - sha256 = "38b20790cdb7333c3cc4b4370b980eb22532c9abc9946c270d764f944afd25be", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-sources.zip", + sha256 = "894d273ee8eece2e1f588aad8e7cf61f56a900279c864433984bd5299a31776c", build_file_content = cc_library_sources, ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathena", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxathena.zip", - sha256 = "625229e94bd0c5a32160e98e2a4cd92227b97c211dc32f13ffacd9b0b2239578", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxathena.zip", + sha256 = "4fcd469a24bb597e0bc8636b36d45caca4314bed483a3dcae73f76bba7b218b2", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenastatic", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxathenastatic.zip", - sha256 = "89047dac67fe3a30dc80ebcca9633bb09af61ce87e7d4664d8a1ffc4132dc1fc", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxathenastatic.zip", + sha256 = "b2822a98e98086513e4b127cbd6e54effa3f3c7f3f86480b64ecdcadaee07e6f", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenadebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxathenadebug.zip", - sha256 = "6d8f4f4ef966636f0503f12e7b679b2d01c184013bad7959a43ef386cc31289f", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxathenadebug.zip", + sha256 = "688172bc8d10409b1a1e7cebbffaebc4fc9d52c81dea70d305859a6d9fc6f75a", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenastaticdebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxathenastaticdebug.zip", - sha256 = "7667f71e9a2b613757b483dd2c333c5a721fea7f3d1ae08c0790027998a0a67b", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxathenastaticdebug.zip", + sha256 = "84d9df452eb1d77683c8811a50d618e9f07873014a04ab0c523ad12247bf7adc", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcore", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxsystemcore.zip", - sha256 = "8e59b6dd9201cb2125aaaa3849cdf241fd836ab0595316744804e6da7a47c24e", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxsystemcore.zip", + sha256 = "bd8f19fdd16291ba940cbccc68dee737ecc74c0035adfe75165c6aa2b5734afd", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcorestatic", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxsystemcorestatic.zip", - sha256 = "35a191ffbfed6172b6d09171a28d6901c0131099862f9f788e4284de7b6ed797", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxsystemcorestatic.zip", + sha256 = "a97b3e9326a6c7aa6ee97233495540b382a312fa57bd02b8d11b21703937e5e9", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcoredebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxsystemcoredebug.zip", - sha256 = "44c7685d193edc0c1185501b90d1d3a31b54f8fd4b09e27f8f92aa9e98017960", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxsystemcoredebug.zip", + sha256 = "b384fcfc4d5b060dd26f4518f5782ab5e21a82b9be26656861eb031fe6df1193", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcorestaticdebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxsystemcorestaticdebug.zip", - sha256 = "5c374076814f7b2804e3125e39c9cae1d62b7c55bad5da2396832c5e1e51d302", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxsystemcorestaticdebug.zip", + sha256 = "455880a03db5e5af9bf337526eca065b59d3aa670ff2b1e4d055cec71339db72", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm32.zip", - sha256 = "7cf7f49d74727485a84fe1a9a3b639a8397dbc9c125fc189c8a63e6547146dc0", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm32.zip", + sha256 = "69dcda97294d51b86db60505de61fb99dd905e92dd5995584d1c62a027d6e652", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm64.zip", - sha256 = "e51b0c62f97f2274a9b62701ad418851a9ecc1f892093e81e9d6ef0e314a568d", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm64.zip", + sha256 = "be814284499e70c94c11934f2ab6ce2f90714f76031d3384957f071cec7f30bc", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxx86-64", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxx86-64.zip", - sha256 = "e9e88f5ff8e21a105c25db158873380a043176f1f87ab6151cdda6991c21f4e5", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxx86-64.zip", + sha256 = "f2d9b51c752bbef26cf613d999054fca2f38e622fa503d32d42c4a6895092c43", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxarm64", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxarm64.zip", - sha256 = "8edeb24523434f774057515a19fc0e350104e340f62c1262a1a63400f660b598", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxarm64.zip", + sha256 = "8994e3281f028e21d837a362b1e23f258b68cc9b0ced1fe1410d3431ba87a0a9", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversal", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxuniversal.zip", - sha256 = "45cd121c465016bdbbe946f7b03399e5cc2819322bfd577908e76e31345dddbc", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxuniversal.zip", + sha256 = "ef8c557a912e28a048ea5a601b6e2494fb855ce4cc628f5630bf82defbd00a61", + build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", + ) + maybe( + http_archive, + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxx86-64.zip", + sha256 = "4aaef18a3074c2db17721844c205df13d27f015e204514216c436adfcd6290dc", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86-64", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86-64.zip", - sha256 = "db1fe7c5727a440f9a04fb7010f62a2a977c80c3cce3aedcac37b566e68be8e5", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86-64.zip", + sha256 = "c230df0a5c26ce77a02638e2f1902d459830e33c1e0b99c3b505135b2687ddf4", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86.zip", - sha256 = "e04a79e393b286d3a4aa2e6f87507fafbb778f434edf1546d7a6ad297f79f3aa", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86.zip", + sha256 = "fd55ef0eaa59b0b715a18bf48db073131b75f92eaac14840a64d263181949bab", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsarm64.zip", - sha256 = "f7dcca5c3606c96c355f1dd6c2c6aa4da08edd4f40fb9234c429efaccf0fcafd", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsarm64.zip", + sha256 = "80aa7f94ccddaf0d92190ce3072f411c39d8ceb6555dfb8a1ecaedc65892b2c2", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32static", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm32static.zip", - sha256 = "27ad5aa85831e13c0d58bd3e4e99f91a37af409f533e0d5af25c6580a98678eb", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm32static.zip", + sha256 = "c9ce67ba109b0cbf5b1c4bbe6aca15b831dc4232b8f71c94895cd0118e08eed9", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64static", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm64static.zip", - sha256 = "d6e55e0d27c677d31f12807f3e5dac725c33fa6ed3c8c3803c5e8913b9bbc83a", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm64static.zip", + sha256 = "f4fe718c0a8f378440ddc7e51dc9353d303c2298985ba7c77f6a838f91b9bd63", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxx86-64static", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxx86-64static.zip", - sha256 = "97f06024300238faf29b139fc111cf085597f2682d44288cf9ddd521aaeaf273", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxx86-64static.zip", + sha256 = "1338d8a0b610cd5a922dc2384be73755345791bf5e6319210f468369d6d80246", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxarm64static", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxarm64static.zip", - sha256 = "f24eb215b2739bb86c503a0242b4c987e9f4c377b5c3630e0a71fd92d2add452", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxarm64static.zip", + sha256 = "b99fe8e498685ba88310ef32f497d582195018233f18f2f3842e48f5edeec84b", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversalstatic", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxuniversalstatic.zip", - sha256 = "0a2149ece011534341d8c5665abda8bb4ffe0e13a66160a0d2a1b6013da27cec", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxuniversalstatic.zip", + sha256 = "eeca3f28ce3b840c8f91ec7ea9f14d8b8d61e21a94cc1b26f693230c26603d05", + build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", + ) + maybe( + http_archive, + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64static", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxx86-64static.zip", + sha256 = "53c01641c2106b802a4cce85ff12f80c4cf4eaecdfeb0b26a3e15b44c61cb34d", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86-64static", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86-64static.zip", - sha256 = "404a1795dde63ceb56151fe451c5b8f07fdded7767b2684f3d4bb521cf8977d2", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86-64static.zip", + sha256 = "22cb69efc521b51d71d018e11a71a8f8e560b750710ac45a6764930dc9a008d9", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86static", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86static.zip", - sha256 = "d14967095652036d7d559ec15919734ad50e1b3a749eec71ac353282b2c0a8af", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86static.zip", + sha256 = "4133f7e2458c9dc1a7771be8231a348073a8f556ab5475dc091b0566c0be7b6b", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64static", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsarm64static.zip", - sha256 = "42c6ee66ca50c54310c30db7ed2484e5afd89d7f1acaa7f52ff644f621383da3", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsarm64static.zip", + sha256 = "1112aac5e9cedde35d1e3ee90d1444ee55db0c68542e1e8d748c1b6ac6e26f40", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32debug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm32debug.zip", - sha256 = "029cdfa474ae6778ec6b52b513fb3f427cd6761ddb3a8f81943c19189f92ff4d", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm32debug.zip", + sha256 = "7833a7ec3acd1e2b9045a3ebd1cbd1d6ab85fe54ef4868c818c0b71b2133fa67", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64debug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm64debug.zip", - sha256 = "7fdc676351062cee38ff2f4a55f8eae0d5370d9ec055818b333bbd652781721b", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm64debug.zip", + sha256 = "60138eb357fc269277c80156853bcd9db08bac7915a0b7051a4a3277c8391f29", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxx86-64debug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxx86-64debug.zip", - sha256 = "a6cd095a907c9820c996ff92f0c24aeb54de994dd85af45a2a957efb3235d288", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxx86-64debug.zip", + sha256 = "35c88d5db2c9cc343e44ccaf3524068b328c7d0ea90df5351c39f1f881d8e40b", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxarm64debug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxarm64debug.zip", - sha256 = "7d5b9fdf4674495b8b9a07dba317fb137aff37bb349d162d959ed0745c40e039", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxarm64debug.zip", + sha256 = "07e8d358f857d64f0c9306a24098bb77f1526a18988230d2e8ef9f881a401928", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversaldebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxuniversaldebug.zip", - sha256 = "018c2f2c2ed3248b49a541006586f20a40bfa31f5befb123a8d2473da3e17c37", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxuniversaldebug.zip", + sha256 = "3fa16c3e1ec2e5e2812cb415c92d649d466b065ed5a0f06352bf40ab32389d69", + build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", + ) + maybe( + http_archive, + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64debug", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxx86-64debug.zip", + sha256 = "9e9a695d428b2ede69faf801b0152c23256384b543ff8768300f97298caa960a", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86-64debug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86-64debug.zip", - sha256 = "39bad61710c7e793c3b716acccf951d7fac7fff76fac26137536e5c0a01784ae", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86-64debug.zip", + sha256 = "ef670782658e7d5b9c50235197c7bf4fa650a9c4125b67a92fd4cdb7c6f77c0a", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86debug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86debug.zip", - sha256 = "af228940fbddf5ea6caf6025f83fcc27755828914e9899bb857bc1f8b27a90f4", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86debug.zip", + sha256 = "df7a44756f97417a24fa2a85b0d801a40864b679d26f45fa12b5c6edd2f88c12", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64debug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsarm64debug.zip", - sha256 = "6e5821cf89dd1358a44d9357cf8f627646dad6afe319db05de646e92558fc2b5", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsarm64debug.zip", + sha256 = "ed86da931fcc66ec21e7d6d4f97a9e3e4dc7264d8929702c68145e984c013791", build_file = "@bzlmodrio-opencv//private/cpp/opencv:shared.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32staticdebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm32staticdebug.zip", - sha256 = "fc29d872881e3245eaf2503f3aa977ebc816862bd63ebd3a645a717199789bd0", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm32staticdebug.zip", + sha256 = "f5185acc7b863c80f6dc9eeeb1fee02200211f8d0e68823b28569d01b509dd8a", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64staticdebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm64staticdebug.zip", - sha256 = "5e28586b216189c526b58a7d6be44e31c97485ee70c77d6a8f8477e64513d2a8", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm64staticdebug.zip", + sha256 = "83dc4aeeb4953ad4adab82ab23b94d4beb69f6ddfc93f0e38cb171fffe28ae9e", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxx86-64staticdebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxx86-64staticdebug.zip", - sha256 = "28c40e3d23775c77974e680a4f9e38b90e2c393c8f23e0f29352a187503cc5d7", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxx86-64staticdebug.zip", + sha256 = "6e0d47e3f4735dc2445bb241ff5e05b48b8110338c54169b5126a23b99b570c1", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxarm64staticdebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxarm64staticdebug.zip", - sha256 = "6c9291c5b4c39f54e5407ff96bbc03c67eb70d1c175d55f743b5489f7f47d8ff", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxarm64staticdebug.zip", + sha256 = "e8739f77519cddcbca8f25fd6437fb196d9fe1edcd63fa3357e62e1880fd089b", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversalstaticdebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxuniversalstaticdebug.zip", - sha256 = "40396534fec1026c438d831e7d0a332f427646417783e6a1ebc02c8c0232ebde", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxuniversalstaticdebug.zip", + sha256 = "5f0bc46c5c959f2ea584a96955906f183283d911b9f7532749d4e9cab8ad8b0e", + build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", + ) + maybe( + http_archive, + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64staticdebug", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxx86-64staticdebug.zip", + sha256 = "6ebd2d2fa123085ac261b539df9c6fd01536660ca21fdebfa60f3eedd7d78359", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86-64staticdebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86-64staticdebug.zip", - sha256 = "fb93511ca90ebf60d97ae51629ae0c03abd7d683d21e968b7f819a4da7c681e1", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86-64staticdebug.zip", + sha256 = "26d8e9752a4ceffcc75c32f386eb3f5dd1f104edf9424c5a28497c862aacc3d2", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86staticdebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86staticdebug.zip", - sha256 = "11c530f7338682a567340d2dacec3956e98a3c1a01dce68c8024c0b1eba9196e", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86staticdebug.zip", + sha256 = "53d760be3957824b452c10b1756ce6ce6718cc5f48bfc96beb869d7750b762f0", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) maybe( http_archive, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64staticdebug", - url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsarm64staticdebug.zip", - sha256 = "656db4670e95120d74754fd3cafa53f62448afde1b042fe27db2eadab24e3d90", + url = "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsarm64staticdebug.zip", + sha256 = "e876349009c07649335c81bba178baea63704fb47e3128f0049ca28dc8d6d8ac", build_file = "@bzlmodrio-opencv//private/cpp/opencv:static.BUILD.bazel", ) diff --git a/maven_java_deps.bzl b/maven_java_deps.bzl index ac83f93..5caced4 100644 --- a/maven_java_deps.bzl +++ b/maven_java_deps.bzl @@ -3,8 +3,8 @@ load("@bazel_tools//tools/build_defs/repo:jvm.bzl", "jvm_maven_import_external") def __setup_bzlmodrio_opencv_java_dependencies(mctx): jvm_maven_import_external( name = "edu_wpi_first_thirdparty_frc2025_opencv_opencv_java", - artifact = "edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:4.10.0-2", - artifact_sha256 = "3b6e65fd154670c7ebca45b47911d6d31faca322e56a70c05833871bedab90c9", + artifact = "edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:4.10.0-3", + artifact_sha256 = "c7ad59669aee50dd6f601ea7e99fdbafb6a0f09aacae1fb1fb19f0b893c7f80e", server_urls = ["https://frcmaven.wpi.edu/release"], ) diff --git a/private/cpp/opencv/BUILD.bazel b/private/cpp/opencv/BUILD.bazel index fd4b31a..4c53be2 100644 --- a/private/cpp/opencv/BUILD.bazel +++ b/private/cpp/opencv/BUILD.bazel @@ -16,10 +16,6 @@ cc_library( }), linkstatic = True, tags = ["manual"], - target_compatible_with = select({ - "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"], - "//conditions:default": [], - }), visibility = ["@bzlmodrio-opencv//:__subpackages__"], deps = ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_headers//:headers"], ) @@ -35,12 +31,10 @@ filegroup( "@rules_bzlmodrio_toolchains//conditions:windows_arm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64//:shared"], "@rules_bzlmodrio_toolchains//conditions:windows_arm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64debug//:shared"], "@rules_bzlmodrio_toolchains//conditions:windows_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86-64debug//:shared"], - "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcore//:shared"], - "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcoredebug//:shared"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32//:shared"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32debug//:shared"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64//:shared"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64debug//:shared"], + "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64//:shared"], + "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64debug//:shared"], + "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32//:shared"], + "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32debug//:shared"], "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathena//:shared"], "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenadebug//:shared"], "//conditions:default": [], @@ -51,10 +45,6 @@ filegroup( cc_library( name = "shared", srcs = [":shared_raw"], - target_compatible_with = select({ - "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"], - "//conditions:default": [], - }), visibility = ["@bzlmodrio-opencv//:__subpackages__"], deps = [] + select({ "@rules_bzlmodrio_toolchains//conditions:windows": [":shared_interface"], @@ -80,12 +70,10 @@ cc_library( "@rules_bzlmodrio_toolchains//conditions:windows_arm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64static//:static_libs"], "@rules_bzlmodrio_toolchains//conditions:windows_arm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64staticdebug//:static_libs"], "@rules_bzlmodrio_toolchains//conditions:windows_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86-64staticdebug//:static_libs"], - "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcorestatic//:static_libs"], - "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcorestaticdebug//:static_libs"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32static//:static_libs"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32staticdebug//:static_libs"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64static//:static_libs"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64staticdebug//:static_libs"], + "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64static//:static_libs"], + "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64staticdebug//:static_libs"], + "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32static//:static_libs"], + "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32staticdebug//:static_libs"], "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenastatic//:static_libs"], "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenastaticdebug//:static_libs"], }), @@ -102,20 +90,14 @@ cc_library( "@rules_bzlmodrio_toolchains//conditions:windows_arm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64//:jni"], "@rules_bzlmodrio_toolchains//conditions:windows_arm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64debug//:jni"], "@rules_bzlmodrio_toolchains//conditions:windows_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86-64debug//:jni"], - "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcore//:jni"], - "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcoredebug//:jni"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32//:jni"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32debug//:jni"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64//:jni"], - "@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64debug//:jni"], + "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64//:jni"], + "@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm64debug//:jni"], + "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32//:jni"], + "@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32debug//:jni"], "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathena//:jni"], "@rules_bzlmodrio_toolchains//constraints/is_roborio:roborio_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenadebug//:jni"], }), linkstatic = 1, - target_compatible_with = select({ - "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"], - "//conditions:default": [], - }), visibility = ["@bzlmodrio-opencv//:__subpackages__"], deps = [ ":shared", diff --git a/private/non_bzlmod_dependencies/download_dependencies.bzl b/private/non_bzlmod_dependencies/download_dependencies.bzl index 1b20e49..ce5fb0a 100644 --- a/private/non_bzlmod_dependencies/download_dependencies.bzl +++ b/private/non_bzlmod_dependencies/download_dependencies.bzl @@ -26,8 +26,9 @@ def download_dependencies(): # Roborio Toolchain http_archive( name = "rules_bzlmodrio_toolchains", - sha256 = "fe267e2af53c1def1e962700a9aeda9e8fdfa9fb46b72167c615ec0e25447dd6", - url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1/rules_bzlmodRio_toolchains-2025-1.tar.gz", + sha256 = "958130b125506a81199b60644ba5127aa9c3e312cef936a08302827469dc8971", + strip_prefix = "rules_bzlmodrio_toolchains-39c30a642687eec03d1dd514af9282a1141616d4", + url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/archive/39c30a642687eec03d1dd514af9282a1141616d4/rules_bzlmodRio_toolchains.tar.gz", ) ######################## diff --git a/private/non_bzlmod_dependencies/setup_dependencies.bzl b/private/non_bzlmod_dependencies/setup_dependencies.bzl index a396212..48d2a35 100644 --- a/private/non_bzlmod_dependencies/setup_dependencies.bzl +++ b/private/non_bzlmod_dependencies/setup_dependencies.bzl @@ -14,9 +14,12 @@ def _setup_toolchains(): "@local_roborio//:macos", "@local_roborio//:linux", "@local_roborio//:windows", - "@local_raspi_32//:macos", - "@local_raspi_32//:linux", - "@local_raspi_32//:windows", + "@local_raspi_bookworm_32//:macos", + "@local_raspi_bookworm_32//:linux", + "@local_raspi_bookworm_32//:windows", + "@local_raspi_bookworm_32//:macos", + "@local_raspi_bookworm_32//:linux", + "@local_raspi_bookworm_32//:windows", "@local_bullseye_32//:macos", "@local_bullseye_32//:linux", "@local_bullseye_32//:windows", diff --git a/tests/.bazelrc b/tests/.bazelrc index 280ffcb..224e3f7 100644 --- a/tests/.bazelrc +++ b/tests/.bazelrc @@ -33,10 +33,21 @@ build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64 build:bookworm64 --build_tag_filters=-no-bookworm build:bookworm64 --platform_suffix=bookworm64 -# rasppi -build:raspi32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspi32 -build:raspi32 --build_tag_filters=-no-raspi -build:raspi32 --platform_suffix=raspi32 +# rasppi bullseye +build:raspibullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibullseye32 +build:raspibullseye32 --build_tag_filters=-no-raspi +build:raspibullseye32 --platform_suffix=raspibullseye32 + +# rasppi bookworm +build:raspibookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibookworm32 +build:raspibookworm32 --build_tag_filters=-no-raspi +build:raspibookworm32 --platform_suffix=raspibookworm32 + +# Alias toolchain names to what wpilibsuite uses for CI/Artifact naming +build:athena --config=roborio +build:systemcore --config=bookworm64 +build:linuxarm32 --config=raspibookworm32 +build:linuxarm64 --config=bookworm64 test --test_output=errors common --registry=https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/ diff --git a/tests/.bazelrc-cc b/tests/.bazelrc-cc index cfbe70b..aafcf41 100644 --- a/tests/.bazelrc-cc +++ b/tests/.bazelrc-cc @@ -65,7 +65,12 @@ build:bookworm64 --incompatible_enable_cc_toolchain_resolution build:bookworm64 --copt=-std=c++20 build:bookworm64 --features=compiler_param_file -# rasppi -build:raspi32 --incompatible_enable_cc_toolchain_resolution -build:raspi32 --copt=-std=c++20 -build:raspi32 --features=compiler_param_file +# rasppi bullseye +build:raspibullseye32 --incompatible_enable_cc_toolchain_resolution +build:raspibullseye32 --copt=-std=c++20 +build:raspibullseye32 --features=compiler_param_file + +# rasppi bookworm +build:raspibookworm32 --incompatible_enable_cc_toolchain_resolution +build:raspibookworm32 --copt=-std=c++20 +build:raspibookworm32 --features=compiler_param_file diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel index a5d0cc2..69c0003 100644 --- a/tests/MODULE.bazel +++ b/tests/MODULE.bazel @@ -16,6 +16,18 @@ bazel_dep(name = "rules_wpiformat", version = "2024.45") bazel_dep(name = "rules_wpi_styleguide", version = "2024.11.19") bazel_dep(name = "rules_spotless", version = "2.40.0") bazel_dep(name = "rules_bzlmodrio_jdk", version = "17.0.12-7") +archive_override( + module_name = "rules_bzlmodrio_jdk", + integrity = "sha256-SrikyrF2v2lENdqn9aFC//d0TkIE620lR60yXTrWFTs=", + strip_prefix = "rules_bzlmodrio_jdk-4ecd4cbc97dfbfe2ceefa627de1228e2f2ca5773", + urls = ["https://github.com/wpilibsuite/rules_bzlmodRio_jdk/archive/4ecd4cbc97dfbfe2ceefa627de1228e2f2ca5773.tar.gz"], +) +archive_override( + module_name = "rules_bzlmodrio_toolchains", + integrity = "sha256-lYEwsSVQaoEZm2BkS6USeqnD4xLO+TaggwKCdGnciXE=", + strip_prefix = "rules_bzlmodrio_toolchains-39c30a642687eec03d1dd514af9282a1141616d4", + urls = ["https://github.com/wpilibsuite/rules_bzlmodrio_toolchains/archive/39c30a642687eec03d1dd514af9282a1141616d4.tar.gz"], +) maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( diff --git a/tests/MODULE.bazel.lock b/tests/MODULE.bazel.lock index 235feb2..883b085 100644 --- a/tests/MODULE.bazel.lock +++ b/tests/MODULE.bazel.lock @@ -39,10 +39,6 @@ "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_android/0.1.1/source.json": "e6986b41626ee10bdc864937ffb6d6bf275bb5b9c65120e6137d56e6331f089e", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_bazelrio/0.0.14/MODULE.bazel": "e4004326cab72e5b27b697a01b03139276ac04c6e7c177ddb9424afc8709e51b", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_bazelrio/0.0.14/source.json": "7da669bc69d497942a9ac21b8f76c05f4a91b4212e3a697a1e27d9358576e995", - "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_bzlmodrio_jdk/17.0.12-7/MODULE.bazel": "8c58348b1dacbb0a31995039530b28b1e3a2169eed829e9ffbb1301ff74672d0", - "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_bzlmodrio_jdk/17.0.12-7/source.json": "275a2ba6f9aba934ce1ea8c12779fb40943c9cd5310df0b00196e4d8505ddb72", - "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_bzlmodrio_toolchains/2025-1/MODULE.bazel": "81e540a541aac221fc84fc24124b8e5d07e2eff75942f44e67510c56794a5f22", - "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_bzlmodrio_toolchains/2025-1/source.json": "c12c55142806504f173541538d7b1debdcf4407a8a357bfccd12287712531cdd", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_cc/0.0.1/MODULE.bazel": "cb2aa0747f84c6c3a78dad4e2049c154f08ab9d166b1273835a8174940365647", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_cc/0.0.2/MODULE.bazel": "6915987c90970493ab97393024c156ea8fb9f3bea953b2f3ec05c34f19b5695c", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_cc/0.0.6/MODULE.bazel": "abf360251023dfe3efcef65ab9d56beefa8394d4176dd29529750e1c57eaa33f", @@ -129,8 +125,8 @@ }, "@@bzlmodrio-opencv~//:maven_cpp_deps.bzl%setup_bzlmodrio_opencv_cpp_dependencies": { "general": { - "bzlTransitiveDigest": "/isRufc59CS8aY7kAXMnt0yvSECYfW73nuUTH8/n50A=", - "usagesDigest": "yCF9KjoFJ8+XZ9GtZK2CPZi3d9/1HP2F0fb9d0d5WC8=", + "bzlTransitiveDigest": "5epfu0xq95H5uSOmG7RPqbuh+iWbq/sPSuBsjmO7o9I=", + "usagesDigest": "mAP4cxp7apQKc/irj3rRnf+z+XnE+ck5LSbmkYfIG3c=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -139,17 +135,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxathena.zip", - "sha256": "625229e94bd0c5a32160e98e2a4cd92227b97c211dc32f13ffacd9b0b2239578", - "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" - } - }, - "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcore": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxsystemcore.zip", - "sha256": "8e59b6dd9201cb2125aaaa3849cdf241fd836ab0595316744804e6da7a47c24e", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxathena.zip", + "sha256": "4fcd469a24bb597e0bc8636b36d45caca4314bed483a3dcae73f76bba7b218b2", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -157,8 +144,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm32staticdebug.zip", - "sha256": "fc29d872881e3245eaf2503f3aa977ebc816862bd63ebd3a645a717199789bd0", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm32staticdebug.zip", + "sha256": "f5185acc7b863c80f6dc9eeeb1fee02200211f8d0e68823b28569d01b509dd8a", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -166,8 +153,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm64static.zip", - "sha256": "d6e55e0d27c677d31f12807f3e5dac725c33fa6ed3c8c3803c5e8913b9bbc83a", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm64static.zip", + "sha256": "f4fe718c0a8f378440ddc7e51dc9353d303c2298985ba7c77f6a838f91b9bd63", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -175,8 +162,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-headers.zip", - "sha256": "c6f5a2f3082b96d0c456e499aa7d5ad24fcad89c11dd6259e6709057fafa798d", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-headers.zip", + "sha256": "b5b7c4a73300b71b96569a26041bc59702b6d4974e60725a569e2d50b140d65e", "build_file_content": "cc_library(\n name = \"headers\",\n hdrs = glob([\"**\"]),\n includes = [\".\"],\n visibility = [\"//visibility:public\"],\n)\n\nfilegroup(\n name = \"header_files\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, @@ -184,8 +171,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxarm64.zip", - "sha256": "8edeb24523434f774057515a19fc0e350104e340f62c1262a1a63400f660b598", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxarm64.zip", + "sha256": "8994e3281f028e21d837a362b1e23f258b68cc9b0ced1fe1410d3431ba87a0a9", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -193,8 +180,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm64staticdebug.zip", - "sha256": "5e28586b216189c526b58a7d6be44e31c97485ee70c77d6a8f8477e64513d2a8", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm64staticdebug.zip", + "sha256": "83dc4aeeb4953ad4adab82ab23b94d4beb69f6ddfc93f0e38cb171fffe28ae9e", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -202,8 +189,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxarm64debug.zip", - "sha256": "7d5b9fdf4674495b8b9a07dba317fb137aff37bb349d162d959ed0745c40e039", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxarm64debug.zip", + "sha256": "07e8d358f857d64f0c9306a24098bb77f1526a18988230d2e8ef9f881a401928", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -211,8 +198,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxuniversal.zip", - "sha256": "45cd121c465016bdbbe946f7b03399e5cc2819322bfd577908e76e31345dddbc", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxuniversal.zip", + "sha256": "ef8c557a912e28a048ea5a601b6e2494fb855ce4cc628f5630bf82defbd00a61", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -220,8 +207,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsarm64staticdebug.zip", - "sha256": "656db4670e95120d74754fd3cafa53f62448afde1b042fe27db2eadab24e3d90", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsarm64staticdebug.zip", + "sha256": "e876349009c07649335c81bba178baea63704fb47e3128f0049ca28dc8d6d8ac", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -229,8 +216,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm64.zip", - "sha256": "e51b0c62f97f2274a9b62701ad418851a9ecc1f892093e81e9d6ef0e314a568d", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm64.zip", + "sha256": "be814284499e70c94c11934f2ab6ce2f90714f76031d3384957f071cec7f30bc", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -238,8 +225,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxx86-64.zip", - "sha256": "e9e88f5ff8e21a105c25db158873380a043176f1f87ab6151cdda6991c21f4e5", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxx86-64.zip", + "sha256": "f2d9b51c752bbef26cf613d999054fca2f38e622fa503d32d42c4a6895092c43", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -247,8 +234,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxathenadebug.zip", - "sha256": "6d8f4f4ef966636f0503f12e7b679b2d01c184013bad7959a43ef386cc31289f", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxathenadebug.zip", + "sha256": "688172bc8d10409b1a1e7cebbffaebc4fc9d52c81dea70d305859a6d9fc6f75a", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -256,8 +243,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm32static.zip", - "sha256": "27ad5aa85831e13c0d58bd3e4e99f91a37af409f533e0d5af25c6580a98678eb", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm32static.zip", + "sha256": "c9ce67ba109b0cbf5b1c4bbe6aca15b831dc4232b8f71c94895cd0118e08eed9", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -265,8 +252,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxx86-64debug.zip", - "sha256": "a6cd095a907c9820c996ff92f0c24aeb54de994dd85af45a2a957efb3235d288", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxx86-64debug.zip", + "sha256": "35c88d5db2c9cc343e44ccaf3524068b328c7d0ea90df5351c39f1f881d8e40b", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -274,8 +261,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxathenastaticdebug.zip", - "sha256": "7667f71e9a2b613757b483dd2c333c5a721fea7f3d1ae08c0790027998a0a67b", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxathenastaticdebug.zip", + "sha256": "84d9df452eb1d77683c8811a50d618e9f07873014a04ab0c523ad12247bf7adc", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -283,8 +270,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxuniversalstatic.zip", - "sha256": "0a2149ece011534341d8c5665abda8bb4ffe0e13a66160a0d2a1b6013da27cec", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxuniversalstatic.zip", + "sha256": "eeca3f28ce3b840c8f91ec7ea9f14d8b8d61e21a94cc1b26f693230c26603d05", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -292,8 +279,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86staticdebug.zip", - "sha256": "11c530f7338682a567340d2dacec3956e98a3c1a01dce68c8024c0b1eba9196e", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86staticdebug.zip", + "sha256": "53d760be3957824b452c10b1756ce6ce6718cc5f48bfc96beb869d7750b762f0", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -301,17 +288,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsarm64static.zip", - "sha256": "42c6ee66ca50c54310c30db7ed2484e5afd89d7f1acaa7f52ff644f621383da3", - "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" - } - }, - "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcorestatic": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxsystemcorestatic.zip", - "sha256": "35a191ffbfed6172b6d09171a28d6901c0131099862f9f788e4284de7b6ed797", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsarm64static.zip", + "sha256": "1112aac5e9cedde35d1e3ee90d1444ee55db0c68542e1e8d748c1b6ac6e26f40", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -319,8 +297,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86-64static.zip", - "sha256": "404a1795dde63ceb56151fe451c5b8f07fdded7767b2684f3d4bb521cf8977d2", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86-64static.zip", + "sha256": "22cb69efc521b51d71d018e11a71a8f8e560b750710ac45a6764930dc9a008d9", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -328,8 +306,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm32debug.zip", - "sha256": "029cdfa474ae6778ec6b52b513fb3f427cd6761ddb3a8f81943c19189f92ff4d", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm32debug.zip", + "sha256": "7833a7ec3acd1e2b9045a3ebd1cbd1d6ab85fe54ef4868c818c0b71b2133fa67", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -337,8 +315,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86-64.zip", - "sha256": "db1fe7c5727a440f9a04fb7010f62a2a977c80c3cce3aedcac37b566e68be8e5", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86-64.zip", + "sha256": "c230df0a5c26ce77a02638e2f1902d459830e33c1e0b99c3b505135b2687ddf4", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -346,8 +324,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86static.zip", - "sha256": "d14967095652036d7d559ec15919734ad50e1b3a749eec71ac353282b2c0a8af", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86static.zip", + "sha256": "4133f7e2458c9dc1a7771be8231a348073a8f556ab5475dc091b0566c0be7b6b", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -355,8 +333,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxx86-64staticdebug.zip", - "sha256": "28c40e3d23775c77974e680a4f9e38b90e2c393c8f23e0f29352a187503cc5d7", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxx86-64staticdebug.zip", + "sha256": "6e0d47e3f4735dc2445bb241ff5e05b48b8110338c54169b5126a23b99b570c1", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -364,26 +342,17 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-sources.zip", - "sha256": "38b20790cdb7333c3cc4b4370b980eb22532c9abc9946c270d764f944afd25be", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-sources.zip", + "sha256": "894d273ee8eece2e1f588aad8e7cf61f56a900279c864433984bd5299a31776c", "build_file_content": "filegroup(\n name = \"sources\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n )\n " } }, - "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcorestaticdebug": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxsystemcorestaticdebug.zip", - "sha256": "5c374076814f7b2804e3125e39c9cae1d62b7c55bad5da2396832c5e1e51d302", - "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" - } - }, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenastatic": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxathenastatic.zip", - "sha256": "89047dac67fe3a30dc80ebcca9633bb09af61ce87e7d4664d8a1ffc4132dc1fc", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxathenastatic.zip", + "sha256": "b2822a98e98086513e4b127cbd6e54effa3f3c7f3f86480b64ecdcadaee07e6f", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -391,8 +360,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86.zip", - "sha256": "e04a79e393b286d3a4aa2e6f87507fafbb778f434edf1546d7a6ad297f79f3aa", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86.zip", + "sha256": "fd55ef0eaa59b0b715a18bf48db073131b75f92eaac14840a64d263181949bab", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -400,8 +369,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxx86-64static.zip", - "sha256": "97f06024300238faf29b139fc111cf085597f2682d44288cf9ddd521aaeaf273", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxx86-64static.zip", + "sha256": "1338d8a0b610cd5a922dc2384be73755345791bf5e6319210f468369d6d80246", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -409,8 +378,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxuniversaldebug.zip", - "sha256": "018c2f2c2ed3248b49a541006586f20a40bfa31f5befb123a8d2473da3e17c37", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxuniversaldebug.zip", + "sha256": "3fa16c3e1ec2e5e2812cb415c92d649d466b065ed5a0f06352bf40ab32389d69", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -418,8 +387,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxarm64staticdebug.zip", - "sha256": "6c9291c5b4c39f54e5407ff96bbc03c67eb70d1c175d55f743b5489f7f47d8ff", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxarm64staticdebug.zip", + "sha256": "e8739f77519cddcbca8f25fd6437fb196d9fe1edcd63fa3357e62e1880fd089b", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -427,8 +396,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86-64staticdebug.zip", - "sha256": "fb93511ca90ebf60d97ae51629ae0c03abd7d683d21e968b7f819a4da7c681e1", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86-64staticdebug.zip", + "sha256": "26d8e9752a4ceffcc75c32f386eb3f5dd1f104edf9424c5a28497c862aacc3d2", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -436,8 +405,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86-64debug.zip", - "sha256": "39bad61710c7e793c3b716acccf951d7fac7fff76fac26137536e5c0a01784ae", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86-64debug.zip", + "sha256": "ef670782658e7d5b9c50235197c7bf4fa650a9c4125b67a92fd4cdb7c6f77c0a", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -445,8 +414,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsarm64debug.zip", - "sha256": "6e5821cf89dd1358a44d9357cf8f627646dad6afe319db05de646e92558fc2b5", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsarm64debug.zip", + "sha256": "ed86da931fcc66ec21e7d6d4f97a9e3e4dc7264d8929702c68145e984c013791", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -454,8 +423,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm32.zip", - "sha256": "7cf7f49d74727485a84fe1a9a3b639a8397dbc9c125fc189c8a63e6547146dc0", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm32.zip", + "sha256": "69dcda97294d51b86db60505de61fb99dd905e92dd5995584d1c62a027d6e652", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -463,8 +432,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxarm64static.zip", - "sha256": "f24eb215b2739bb86c503a0242b4c987e9f4c377b5c3630e0a71fd92d2add452", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxarm64static.zip", + "sha256": "b99fe8e498685ba88310ef32f497d582195018233f18f2f3842e48f5edeec84b", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -472,17 +441,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxarm64debug.zip", - "sha256": "7fdc676351062cee38ff2f4a55f8eae0d5370d9ec055818b333bbd652781721b", - "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" - } - }, - "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcoredebug": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-linuxsystemcoredebug.zip", - "sha256": "44c7685d193edc0c1185501b90d1d3a31b54f8fd4b09e27f8f92aa9e98017960", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-linuxarm64debug.zip", + "sha256": "60138eb357fc269277c80156853bcd9db08bac7915a0b7051a4a3277c8391f29", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -490,8 +450,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsarm64.zip", - "sha256": "f7dcca5c3606c96c355f1dd6c2c6aa4da08edd4f40fb9234c429efaccf0fcafd", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsarm64.zip", + "sha256": "80aa7f94ccddaf0d92190ce3072f411c39d8ceb6555dfb8a1ecaedc65892b2c2", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, @@ -499,8 +459,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-osxuniversalstaticdebug.zip", - "sha256": "40396534fec1026c438d831e7d0a332f427646417783e6a1ebc02c8c0232ebde", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-osxuniversalstaticdebug.zip", + "sha256": "5f0bc46c5c959f2ea584a96955906f183283d911b9f7532749d4e9cab8ad8b0e", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" } }, @@ -508,8 +468,8 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-2/opencv-cpp-4.10.0-2-windowsx86debug.zip", - "sha256": "af228940fbddf5ea6caf6025f83fcc27755828914e9899bb857bc1f8b27a90f4", + "url": "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-cpp/4.10.0-3/opencv-cpp-4.10.0-3-windowsx86debug.zip", + "sha256": "df7a44756f97417a24fa2a85b0d801a40864b679d26f45fa12b5c6edd2f88c12", "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } } @@ -525,8 +485,8 @@ }, "@@bzlmodrio-opencv~//:maven_java_deps.bzl%setup_bzlmodrio_opencv_java_dependencies": { "general": { - "bzlTransitiveDigest": "fxkbwhKFyJILtk04Uyj6D9dlD9qGGi9qD8LzB6BOcg0=", - "usagesDigest": "0eEdRZNIVYRSSDHeF2+GKrK+brwbzO7t1zGlPIxO69s=", + "bzlTransitiveDigest": "2ZwamkH+VmDdy0ue/dFtUt2+KSm4F7hFiMHm4FMd8N4=", + "usagesDigest": "3VfqoJcXXNNpSsnV19Ta57hg2z6NXTwByjqQNkQbHsk=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -537,15 +497,15 @@ "attributes": { "generated_rule_name": "edu_wpi_first_thirdparty_frc2025_opencv_opencv_java", "artifact_urls": [ - "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-java/4.10.0-2/opencv-java-4.10.0-2.jar" + "https://frcmaven.wpi.edu/release/edu/wpi/first/thirdparty/frc2025/opencv/opencv-java/4.10.0-3/opencv-java-4.10.0-3.jar" ], "srcjar_urls": [], - "canonical_id": "edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:4.10.0-2", + "canonical_id": "edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:4.10.0-3", "rule_name": "java_import", "tags": [ - "maven_coordinates=edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:4.10.0-2" + "maven_coordinates=edu.wpi.first.thirdparty.frc2025.opencv:opencv-java:4.10.0-3" ], - "artifact_sha256": "3b6e65fd154670c7ebca45b47911d6d31faca322e56a70c05833871bedab90c9" + "artifact_sha256": "c7ad59669aee50dd6f601ea7e99fdbafb6a0f09aacae1fb1fb19f0b893c7f80e" } } }, @@ -577,8 +537,8 @@ }, "@@rules_bzlmodrio_jdk~//:maven_deps.bzl%deps": { "general": { - "bzlTransitiveDigest": "7ioqtKce/6QadqNFBEuf5tiz23b1dU71qDrtAVwozkE=", - "usagesDigest": "pRvwQUOBWw+KhvSqJX6bqOAYSSjSiC4rBqjMsMw6Qqc=", + "bzlTransitiveDigest": "peyObOsAjevTVPgKd5FlyL5aFMQ+F60yQkGHVq1Gtw0=", + "usagesDigest": "U+tCKAYT563wXiw5hz8oK2Hf7s4NG7RTkarVy+SX5mQ=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -644,7 +604,19 @@ "urls": [ "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_x64_windows_hotspot_17.0.12_7.zip" ], - "strip_prefix": "jdk-17.0.12+7" + "strip_prefix": "jdk-17.0.12+7", + "patch_cmds": [ + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/concrt140.dll bin/concrt140.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140.dll bin/msvcp140.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_1.dll bin/msvcp140_1.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_2.dll bin/msvcp140_2.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_atomic_wait.dll bin/msvcp140_atomic_wait.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/msvcp140_codecvt_ids.dll bin/msvcp140_codecvt_ids.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vccorlib140.dll bin/vccorlib140.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vcruntime140.dll bin/vcruntime140.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vcruntime140_1.dll bin/vcruntime140_1.dll", + "cp ../rules_bzlmodrio_jdk~/msvc_runtime/vcruntime140_threads.dll bin/vcruntime140_threads.dll" + ] } }, "roboriojdk_linux": { @@ -680,6 +652,11 @@ } }, "recordedRepoMappingEntries": [ + [ + "rules_bzlmodrio_jdk~", + "rules_bzlmodrio_jdk", + "rules_bzlmodrio_jdk~" + ], [ "rules_bzlmodrio_jdk~", "rules_java", @@ -695,8 +672,8 @@ }, "@@rules_bzlmodrio_toolchains~//:extensions.bzl%sh_configure": { "general": { - "bzlTransitiveDigest": "LQy5WwXZjBTqwJHalVfhbKbK9laYAny9ZL/lnK3qa70=", - "usagesDigest": "ipkyhWoUmiPTmPGG8I4T5THThHgzGqINmM1fXk9metI=", + "bzlTransitiveDigest": "zxxMdXovSVhpaYfsRxxzd4xDCDbckI5u0oP1hWbmfyg=", + "usagesDigest": "uonolgw+fRKloO6hqlkUNhn2dgbGC3sUZiZUqJYf9jY=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -740,17 +717,17 @@ "repo_shortname": "bullseye_32" } }, - "local_raspi_32": { + "local_raspi_bookworm_32": { "bzlFile": "@@rules_bzlmodrio_toolchains~//toolchains:configure_cross_compiler.bzl", "ruleClassName": "configure_cross_compiler", "attributes": { - "compiler": "raspi-32", - "bin_subfolder": "raspi-bullseye/bin", - "bin_prefix": "armv6-bullseye-linux-gnueabihf-", - "sysroot_subfolder": "raspi-bullseye/arm-linux-gnueabihf/sysroot", + "compiler": "raspi-bookworm-32", + "bin_subfolder": "raspi-bookworm/bin", + "bin_prefix": "armv6-bookworm-linux-gnueabihf-", + "sysroot_subfolder": "raspi-bookworm/arm-linux-gnueabihf/sysroot", "cxx_version": "10", "sysroot_include_folder": "arm-linux-gnueabihf", - "repo_shortname": "raspi_32" + "repo_shortname": "raspi_bookworm_32" } }, "local_bookworm_32": { @@ -778,6 +755,19 @@ "sysroot_include_folder": "aarch64-linux-gnu", "repo_shortname": "bookworm_64" } + }, + "local_raspi_bullseye_32": { + "bzlFile": "@@rules_bzlmodrio_toolchains~//toolchains:configure_cross_compiler.bzl", + "ruleClassName": "configure_cross_compiler", + "attributes": { + "compiler": "raspi-bullseye-32", + "bin_subfolder": "raspi-bullseye/bin", + "bin_prefix": "armv6-bullseye-linux-gnueabihf-", + "sysroot_subfolder": "raspi-bullseye/arm-linux-gnueabihf/sysroot", + "cxx_version": "10", + "sysroot_include_folder": "arm-linux-gnueabihf", + "repo_shortname": "raspi_bullseye_32" + } } }, "recordedRepoMappingEntries": [] @@ -785,27 +775,27 @@ }, "@@rules_bzlmodrio_toolchains~//:maven_deps.bzl%deps": { "general": { - "bzlTransitiveDigest": "PYkNyj+XbBQvHPPHyChfAG63ZQcZiGabDgJ03LgU3ck=", - "usagesDigest": "KhLKV6SJsChc6iV+S5gik/IBA1F3oZeGedOAcKwy2iU=", + "bzlTransitiveDigest": "GM0I8AartRlE8RSwTMG7A4F3pL0nggDUq3Cw0mJCCyo=", + "usagesDigest": "4/3/JS7eRFlnL/LaNaWtSvAotjn9NVmTvf0dYduyXNo=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { - "bazelrio_raspi_32_toolchain_linux": { + "bazelrio_bookworm_32_toolchain_linux": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-raspi-bullseye-2025-x86_64-linux-gnu-Toolchain-10.2.0.tgz", - "sha256": "b53465a8d36de937a0f88299f8ab3a97db5af3cdf4f7e52473bf294c5c1da3f6", + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz", + "sha256": "3a0d0b350c359c8a46ce58e654ba4d5e97177833f0181792151401fe110aac32", "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_bookworm_32_toolchain_linux": { + "bazelrio_raspi_bookworm_32_toolchain_macos": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz", - "sha256": "3a0d0b350c359c8a46ce58e654ba4d5e97177833f0181792151401fe110aac32", + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-raspi-bookworm-2025-x86_64-apple-darwin-Toolchain-12.2.0.tgz", + "sha256": "9e0db21b655956fea0e9169a9d7daf86ccde1c78bdf42d633305ab8efb944c23", "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, @@ -827,30 +817,30 @@ "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_bullseye_64_toolchain_windows": { + "bazelrio_bullseye_64_toolchain_macosarm": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bullseye-2025-x86_64-w64-mingw32-Toolchain-10.2.0.zip", - "sha256": "d978c2baa757571b3cb413844f3fa26b779259a4f8a680fb2fb872a13c8618b3", + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bullseye-2025-arm64-apple-darwin-Toolchain-10.2.0.tgz", + "sha256": "0f67594b4ea984b6296e838e0f1e8e6efde58916f98b4a650a8b3c391ce18e04", "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_bullseye_32_toolchain_macos": { + "bazelrio_roborio_toolchain_macosarm": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-bullseye-2025-x86_64-apple-darwin-Toolchain-10.2.0.tgz", - "sha256": "d46d8191b8ad04494439bf4d14dc599d8531552e56f25dcd7949dc9cf7b0d512", + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/cortexa9_vfpv3-roborio-academic-2025-arm64-apple-darwin-Toolchain-12.1.0.tgz", + "sha256": "2fb949bf683ac2ecf3874767369c9f6a013941cd9e702f08bd5e4a248e9b82dd", "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_bullseye_64_toolchain_linux": { + "bazelrio_bullseye_32_toolchain_macos": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bullseye-2025-x86_64-linux-gnu-Toolchain-10.2.0.tgz", - "sha256": "df3b1fa4ca83d61e853fa32620ede3f2402dc3b6088653c1ae85714cd5c566ed", + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-bullseye-2025-x86_64-apple-darwin-Toolchain-10.2.0.tgz", + "sha256": "d46d8191b8ad04494439bf4d14dc599d8531552e56f25dcd7949dc9cf7b0d512", "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, @@ -863,30 +853,30 @@ "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_bookworm_32_toolchain_macos": { + "bazelrio_raspi_bookworm_32_toolchain_macosarm": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-bookworm-2025-x86_64-apple-darwin-Toolchain-12.2.0.tgz", - "sha256": "633fccbe1508478b095a03a05477795825971cdac0860bf3a0f79f5be2f73a5a", + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-raspi-bookworm-2025-arm64-apple-darwin-Toolchain-12.2.0.tgz", + "sha256": "ec754b7d64d3e989dd6dd7a91abab7b4ca9abc5c75f252ab37ffc585ac39a287", "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_bullseye_32_toolchain_windows": { + "bazelrio_bookworm_64_toolchain_linux": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-bullseye-2025-x86_64-w64-mingw32-Toolchain-10.2.0.zip", - "sha256": "6d2d6684ffc8791d2a261fb8ed8b92d8c00408f0b24dcd5557ed3aebdd096c15", + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz", + "sha256": "d94005ae516bb43fc85a07ed89cb51bec96ed931ca5c084427f1432a1dbf71e9", "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_bookworm_64_toolchain_linux": { + "bazelrio_raspi_bookworm_32_toolchain_linux": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz", - "sha256": "d94005ae516bb43fc85a07ed89cb51bec96ed931ca5c084427f1432a1dbf71e9", + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-raspi-bookworm-2025-x86_64-linux-gnu-Toolchain-12.2.0.tgz", + "sha256": "e3cf3a726268aafa55d79af588a1d02392c073a033b8c3b2a0c6ccd99e18a184", "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, @@ -899,16 +889,106 @@ "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_bookworm_64_toolchain_windows": { + "bazelrio_roborio_toolchain_windows": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bookworm-2025-x86_64-w64-mingw32-Toolchain-12.2.0.zip", - "sha256": "50f26a9b0ae595bd536f5b7003a465b04871005cbe57c18e84f657e83df13f4c", + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/cortexa9_vfpv3-roborio-academic-2025-x86_64-w64-mingw32-Toolchain-12.1.0.zip", + "sha256": "1395ae04cf5c617683ff8eb473c949740a6bb57c9405668f179c7206ab6ba3f8", + "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" + } + }, + "bazelrio_bookworm_64_toolchain_macos": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bookworm-2025-x86_64-apple-darwin-Toolchain-12.2.0.tgz", + "sha256": "34af7c9b601bbce1fe5c5e07f70fe8abd7ed3985cc603dbc12ef7f3d8c2f0b9d", + "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" + } + }, + "bazelrio_raspi_bookworm_32_toolchain_windows": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-raspi-bookworm-2025-x86_64-w64-mingw32-Toolchain-12.2.0.zip", + "sha256": "dead6a0066885c51b64871d8cd8116919a0cf4040960af1bce0e26290ee4f034", + "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" + } + }, + "bazelrio_bullseye_32_toolchain_macosarm": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-bullseye-2025-arm64-apple-darwin-Toolchain-10.2.0.tgz", + "sha256": "abf3216fd08968bf3bef67c3cbad720c9dc1385672197a2b2d5f2009a7fd995e", + "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" + } + }, + "bazelrio_bullseye_64_toolchain_windows": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bullseye-2025-x86_64-w64-mingw32-Toolchain-10.2.0.zip", + "sha256": "d978c2baa757571b3cb413844f3fa26b779259a4f8a680fb2fb872a13c8618b3", "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_raspi_32_toolchain_windows": { + "bazelrio_bullseye_64_toolchain_linux": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bullseye-2025-x86_64-linux-gnu-Toolchain-10.2.0.tgz", + "sha256": "df3b1fa4ca83d61e853fa32620ede3f2402dc3b6088653c1ae85714cd5c566ed", + "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" + } + }, + "bazelrio_raspi_bullseye_32_toolchain_linux": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-raspi-bullseye-2025-x86_64-linux-gnu-Toolchain-10.2.0.tgz", + "sha256": "b53465a8d36de937a0f88299f8ab3a97db5af3cdf4f7e52473bf294c5c1da3f6", + "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" + } + }, + "bazelrio_bookworm_32_toolchain_macos": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-bookworm-2025-x86_64-apple-darwin-Toolchain-12.2.0.tgz", + "sha256": "633fccbe1508478b095a03a05477795825971cdac0860bf3a0f79f5be2f73a5a", + "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" + } + }, + "bazelrio_bullseye_32_toolchain_windows": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-bullseye-2025-x86_64-w64-mingw32-Toolchain-10.2.0.zip", + "sha256": "6d2d6684ffc8791d2a261fb8ed8b92d8c00408f0b24dcd5557ed3aebdd096c15", + "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" + } + }, + "bazelrio_raspi_bullseye_32_toolchain_macosarm": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-raspi-bullseye-2025-arm64-apple-darwin-Toolchain-10.2.0.tgz", + "sha256": "3f30b54ef98aba939058680ba7906b59da758552ee183595dc006613744e0038", + "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" + } + }, + "bazelrio_bookworm_32_toolchain_macosarm": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/armhf-bookworm-2025-arm64-apple-darwin-Toolchain-12.2.0.tgz", + "sha256": "dddddbd08ca3771581f9a77311191d60371b0e5dc4ba166450198f3a59c43d13", + "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" + } + }, + "bazelrio_raspi_bullseye_32_toolchain_windows": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { @@ -917,21 +997,21 @@ "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_roborio_toolchain_windows": { + "bazelrio_bookworm_64_toolchain_windows": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/cortexa9_vfpv3-roborio-academic-2025-x86_64-w64-mingw32-Toolchain-12.1.0.zip", - "sha256": "1395ae04cf5c617683ff8eb473c949740a6bb57c9405668f179c7206ab6ba3f8", + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bookworm-2025-x86_64-w64-mingw32-Toolchain-12.2.0.zip", + "sha256": "50f26a9b0ae595bd536f5b7003a465b04871005cbe57c18e84f657e83df13f4c", "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_bookworm_64_toolchain_macos": { + "bazelrio_bookworm_64_toolchain_macosarm": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bookworm-2025-x86_64-apple-darwin-Toolchain-12.2.0.tgz", - "sha256": "34af7c9b601bbce1fe5c5e07f70fe8abd7ed3985cc603dbc12ef7f3d8c2f0b9d", + "url": "https://github.com/wpilibsuite/opensdk/releases/download/v2025-1/arm64-bookworm-2025-arm64-apple-darwin-Toolchain-12.2.0.tgz", + "sha256": "e29fa2433cee667d75ff106543d88d3d4154e2f450c79d86d316d5b8015d11e4", "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, @@ -944,7 +1024,7 @@ "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, - "bazelrio_raspi_32_toolchain_macos": { + "bazelrio_raspi_bullseye_32_toolchain_macos": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { From 48b1fb9fc6d27c875f2a1a283c42622b28bdf4ec Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Wed, 1 Jan 2025 06:23:53 -0500 Subject: [PATCH 2/3] Fixup --- .github/workflows/build.yml | 91 ++++---------------------------- libraries/cpp/opencv/BUILD.bazel | 4 -- private/cpp/opencv/BUILD.bazel | 4 -- 3 files changed, 9 insertions(+), 90 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78c2ee7..6d00a51 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,93 +84,20 @@ jobs: run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci working-directory: tests - build_bullseye32: + build_linuxarm32: strategy: fail-fast: false matrix: include: - # Build non-bzlmod, bullseye32 - - { name: "windows - bullseye32", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", } - - { name: "ubuntu - bullseye32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "", } - - { name: "macos - bullseye32", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "", } + # Build non-bzlmod, linuxarm32 + - { name: "windows - linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", } + - { name: "ubuntu - linuxarm32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm32", bazel_options: "", } + - { name: "macos - linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=linuxarm32", bazel_options: "", } - # Build bzlmod, bullseye32 - - { name: "windows - bzlmod bullseye32", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", } - - { name: "ubuntu - bzlmod bullseye32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "", } - - { name: "macos - bzlmod bullseye32", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "", } - name: "Build - ${{ matrix.name }}" - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: { python-version: '3.11' } - - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: 17 - architecture: ${{ matrix.java_arch }} - - id: setup_build_buddy - uses: ./.github/actions/setup-build-buddy - with: - token: ${{ secrets.BUILDBUDDY_API_KEY }} - - name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around - run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci || true - working-directory: tests - - name: Build - run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci - working-directory: tests - - - build_bullseye64: - strategy: - fail-fast: false - matrix: - include: - # Build non-bzlmod, bullseye64: - - { name: "windows - bullseye64", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", } - - { name: "ubuntu - bullseye64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "", } - - { name: "macos - bullseye64", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "", } - - # Build bzlmod, bullseye64: - - { name: "windows - bzlmod bullseye64", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", } - - { name: "ubuntu - bzlmod bullseye64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "", } - - { name: "macos - bzlmod bullseye64", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "", } - name: "Build - ${{ matrix.name }}" - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v5 - with: { python-version: '3.11' } - - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: 17 - architecture: ${{ matrix.java_arch }} - - id: setup_build_buddy - uses: ./.github/actions/setup-build-buddy - with: - token: ${{ secrets.BUILDBUDDY_API_KEY }} - - name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around - run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci || true - working-directory: tests - - name: Build - run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci - working-directory: tests - - build_bookworm64: - strategy: - fail-fast: false - matrix: - include: - # Build non-bzlmod, bookworm64: - - { name: "windows - bookworm64", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bookworm64", bazel_options: "--output_user_root=C:\\bazelroot", } - - { name: "ubuntu - bookworm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bookworm64", bazel_options: "", } - - { name: "macos - bookworm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bookworm64", bazel_options: "", } - - # Build bzlmod, bookworm64: - - { name: "windows - bzlmod bookworm64", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bookworm64", bazel_options: "--output_user_root=C:\\bazelroot", } - - { name: "ubuntu - bzlmod bookworm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bookworm64", bazel_options: "", } - - { name: "macos - bzlmod bookworm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bookworm64", bazel_options: "", } + # Build bzlmod, linuxarm32 + - { name: "windows - bzlmod linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", } + - { name: "ubuntu - bzlmod linuxarm32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "", } + - { name: "macos - bzlmod linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "", } name: "Build - ${{ matrix.name }}" runs-on: ${{ matrix.os }} steps: diff --git a/libraries/cpp/opencv/BUILD.bazel b/libraries/cpp/opencv/BUILD.bazel index bc927d6..cd158e6 100644 --- a/libraries/cpp/opencv/BUILD.bazel +++ b/libraries/cpp/opencv/BUILD.bazel @@ -13,10 +13,6 @@ alias( alias( name = "static", actual = "@bzlmodrio-opencv//private/cpp/opencv:static", - target_compatible_with = select({ - "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"], - "//conditions:default": [], - }), visibility = ["//visibility:public"], ) diff --git a/private/cpp/opencv/BUILD.bazel b/private/cpp/opencv/BUILD.bazel index 4c53be2..2d9b639 100644 --- a/private/cpp/opencv/BUILD.bazel +++ b/private/cpp/opencv/BUILD.bazel @@ -56,10 +56,6 @@ cc_library( cc_library( name = "static", linkstatic = 1, - target_compatible_with = select({ - "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"], - "//conditions:default": [], - }), visibility = ["@bzlmodrio-opencv//:__subpackages__"], deps = ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_headers//:headers"] + select({ "@rules_bzlmodrio_toolchains//conditions:linux_x86_64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxx86-64static//:static_libs"], From c834846b20fe8c58a03a7721700d4749d381243a Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Fri, 3 Jan 2025 22:53:04 -0500 Subject: [PATCH 3/3] Fixup --- .github/workflows/build.yml | 2 +- MODULE.bazel | 2 +- private/non_bzlmod_dependencies/download_dependencies.bzl | 5 ++--- tests/MODULE.bazel | 8 +------- tests/WORKSPACE | 5 +++-- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6d00a51..689aaf3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,7 +95,7 @@ jobs: - { name: "macos - linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=linuxarm32", bazel_options: "", } # Build bzlmod, linuxarm32 - - { name: "windows - bzlmod linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", } + # - { name: "windows - bzlmod linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", } - { name: "ubuntu - bzlmod linuxarm32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "", } - { name: "macos - bzlmod linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "", } name: "Build - ${{ matrix.name }}" diff --git a/MODULE.bazel b/MODULE.bazel index 11cb26e..b2dc040 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -7,7 +7,7 @@ module( bazel_dep(name = "platforms", version = "0.0.9") bazel_dep(name = "rules_cc", version = "0.0.9") bazel_dep(name = "rules_java", version = "7.6.5") -bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1") +bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr1") setup_bzlmodrio_opencv_cpp_dependencies = use_extension("//:maven_cpp_deps.bzl", "setup_bzlmodrio_opencv_cpp_dependencies") use_repo( diff --git a/private/non_bzlmod_dependencies/download_dependencies.bzl b/private/non_bzlmod_dependencies/download_dependencies.bzl index ce5fb0a..388022f 100644 --- a/private/non_bzlmod_dependencies/download_dependencies.bzl +++ b/private/non_bzlmod_dependencies/download_dependencies.bzl @@ -26,9 +26,8 @@ def download_dependencies(): # Roborio Toolchain http_archive( name = "rules_bzlmodrio_toolchains", - sha256 = "958130b125506a81199b60644ba5127aa9c3e312cef936a08302827469dc8971", - strip_prefix = "rules_bzlmodrio_toolchains-39c30a642687eec03d1dd514af9282a1141616d4", - url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/archive/39c30a642687eec03d1dd514af9282a1141616d4/rules_bzlmodRio_toolchains.tar.gz", + sha256 = "559ff5ddc402dca6266a765770c3a65db23e2060c45355c57612737bcc592b78", + url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1.bcr1/rules_bzlmodRio_toolchains-2025-1.bcr1.tar.gz", ) ######################## diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel index 69c0003..757f127 100644 --- a/tests/MODULE.bazel +++ b/tests/MODULE.bazel @@ -9,7 +9,7 @@ bazel_dep(name = "rules_cc", version = "0.0.9") bazel_dep(name = "rules_java", version = "7.6.5") bazel_dep(name = "rules_jvm_external", version = "6.1") bazel_dep(name = "rules_bazelrio", version = "0.0.14") -bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1") +bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr1") bazel_dep(name = "rules_pmd", version = "7.2.0") bazel_dep(name = "rules_checkstyle", version = "10.12.2") bazel_dep(name = "rules_wpiformat", version = "2024.45") @@ -22,12 +22,6 @@ archive_override( strip_prefix = "rules_bzlmodrio_jdk-4ecd4cbc97dfbfe2ceefa627de1228e2f2ca5773", urls = ["https://github.com/wpilibsuite/rules_bzlmodRio_jdk/archive/4ecd4cbc97dfbfe2ceefa627de1228e2f2ca5773.tar.gz"], ) -archive_override( - module_name = "rules_bzlmodrio_toolchains", - integrity = "sha256-lYEwsSVQaoEZm2BkS6USeqnD4xLO+TaggwKCdGnciXE=", - strip_prefix = "rules_bzlmodrio_toolchains-39c30a642687eec03d1dd514af9282a1141616d4", - urls = ["https://github.com/wpilibsuite/rules_bzlmodrio_toolchains/archive/39c30a642687eec03d1dd514af9282a1141616d4.tar.gz"], -) maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven.install( diff --git a/tests/WORKSPACE b/tests/WORKSPACE index 930f24e..6cbb6af 100644 --- a/tests/WORKSPACE +++ b/tests/WORKSPACE @@ -81,8 +81,9 @@ load_styleguide_pins() http_archive( name = "rules_bzlmodrio_jdk", - sha256 = "81869fe9860e39b17e4a9bc1d33c1ca2faede7e31d9538ed0712406f753a2163", - url = "https://github.com/wpilibsuite/rules_bzlmodRio_jdk/releases/download/17.0.12-7/rules_bzlmodRio_jdk-17.0.12-7.tar.gz", + integrity = "sha256-SrikyrF2v2lENdqn9aFC//d0TkIE620lR60yXTrWFTs=", + strip_prefix = "rules_bzlmodrio_jdk-4ecd4cbc97dfbfe2ceefa627de1228e2f2ca5773", + urls = ["https://github.com/wpilibsuite/rules_bzlmodRio_jdk/archive/4ecd4cbc97dfbfe2ceefa627de1228e2f2ca5773.tar.gz"], ) load("@rules_bzlmodrio_jdk//:maven_deps.bzl", "setup_legacy_setup_jdk_dependencies")