From d36b1d0dd9e682987b309a61769ae9e1e414eda7 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 8 Jul 2025 23:20:08 -0400 Subject: [PATCH] [bazel] Update bazel toolchain, libssh, opencv (#8075) --- BUILD.bazel | 3 ++- WORKSPACE | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 50a2e70ace..dffbe9fae7 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -24,8 +24,9 @@ compile_pip_requirements( alias( name = "quickbuf_protoc", actual = select({ - "@bazel_tools//src/conditions:darwin": "@quickbuffer_protoc_osx//file", "@bazel_tools//src/conditions:windows": "@quickbuffer_protoc_windows//file", + "@rules_bzlmodrio_toolchains//conditions:osx_aarch64": "@quickbuffer_protoc_osx_aarch64//file", + "@rules_bzlmodrio_toolchains//conditions:osx_x86_64": "@quickbuffer_protoc_osx_x86-64//file", "@rules_bzlmodrio_toolchains//constraints/combined:is_linux": "@quickbuffer_protoc_linux//file", }), tags = ["pregeneration"], diff --git a/WORKSPACE b/WORKSPACE index 5c0c744583..29dabdebd5 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -63,8 +63,8 @@ http_archive( # Download toolchains http_archive( name = "rules_bzlmodrio_toolchains", - sha256 = "2bf0266dd899ce634549d5e610c04b871047b75b9d02ea72d37a4d3c28ac981f", - url = "https://github.com/wpilibsuite/rules_bzlmodrio_toolchains/releases/download/2025-1.bcr3/rules_bzlmodrio_toolchains-2025-1.bcr3.tar.gz", + sha256 = "37780b3d3f30de72aaca12d9f80edc4216f6d708bed5b261c424d4dde49e8531", + url = "https://github.com/wpilibsuite/rules_bzlmodrio_toolchains/releases/download/2025-1.bcr4/rules_bzlmodrio_toolchains-2025-1.bcr4.tar.gz", ) load("@bazel_features//:deps.bzl", "bazel_features_deps") @@ -282,8 +282,8 @@ setup_legacy_bzlmodrio_ni_cpp_dependencies() http_archive( name = "bzlmodrio-opencv", - sha256 = "6e8544fae07ed5b4fedc146f6ad083d0d8947e3efb5332a20abc46601a52a1b5", - url = "https://github.com/wpilibsuite/bzlmodRio-opencv/releases/download/2025.4.10.0-3.bcr2/bzlmodRio-opencv-2025.4.10.0-3.bcr2.tar.gz", + sha256 = "27dff7aaedd00165b1a94867616ebf383220532e3956892cec649197077a9d01", + url = "https://github.com/wpilibsuite/bzlmodRio-opencv/releases/download/2025.4.10.0-3.bcr3/bzlmodRio-opencv-2025.4.10.0-3.bcr3.tar.gz", ) load("@bzlmodrio-opencv//:maven_cpp_deps.bzl", "setup_legacy_bzlmodrio_opencv_cpp_dependencies") @@ -296,9 +296,8 @@ setup_legacy_bzlmodrio_opencv_java_dependencies() http_archive( name = "bzlmodrio-libssh", - sha256 = "65caef82554617403a16c79e8bcac6553d40eca3e23197e63275bba22db7d5b5", - strip_prefix = "bzlmodRio-libssh-8405fbd5eb4e42b495f08f6ccf6fbbe5ced28bb7", - urls = ["https://github.com/wpilibsuite/bzlmodRio-libssh/archive/8405fbd5eb4e42b495f08f6ccf6fbbe5ced28bb7.tar.gz"], + sha256 = "f8fef627c7b393f7f6ed638e12b80ff90b2cfea11488b15214f25ce1e470723a", + url = "https://github.com/wpilibsuite/bzlmodRio-libssh/releases/download/2024.0.105-1.bcr1/bzlmodrio-libssh-2024.0.105-1.bcr1.tar.gz", ) load("@bzlmodrio-libssh//:maven_cpp_deps.bzl", "setup_legacy_bzlmodrio_libssh_cpp_dependencies") @@ -316,12 +315,19 @@ http_file( ) http_file( - name = "quickbuffer_protoc_osx", + name = "quickbuffer_protoc_osx_x86-64", executable = True, sha256 = "ea307c2b69664ae7e7c69db4cddf5803187e5a34bceffd09a21652f0f16044f7", url = "https://repo1.maven.org/maven2/us/hebi/quickbuf/protoc-gen-quickbuf/" + QUICKBUF_VERSION + "/protoc-gen-quickbuf-" + QUICKBUF_VERSION + "-osx-x86_64.exe ", ) +http_file( + name = "quickbuffer_protoc_osx_aarch64", + executable = True, + sha256 = "a9abdee09d8b5ef0aa954b238536917313511deec11e1901994af26ade033e28", + url = "https://repo1.maven.org/maven2/us/hebi/quickbuf/protoc-gen-quickbuf/" + QUICKBUF_VERSION + "/protoc-gen-quickbuf-" + QUICKBUF_VERSION + "-osx-aarch_64.exe ", +) + http_file( name = "quickbuffer_protoc_windows", executable = True,