From d5104a17007af28bb8385ce55c45b99c4854c4a5 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Fri, 4 Oct 2024 03:21:39 -0400 Subject: [PATCH] Again --- MODULE.bazel | 2 +- generate/get_phoenix_dependencies.py | 4 ++-- private/non_bzlmod_dependencies/download_dependencies.bzl | 8 ++++---- tests/MODULE.bazel | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index c2ca836..057a0bd 100644 --- a/MODULE.bazel +++ b/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_bzlmodrio_toolchains", version = "2024-1.bcr1") bazel_dep(name = "bzlmodrio-allwpilib", version = "2024.1.1") -bazel_dep(name = "bzlmodrio-opencv", version = "2024.4.8.0-1.bcr1") +bazel_dep(name = "bzlmodrio-opencv", version = "2024.4.8.0-4.bcr1") bazel_dep(name = "bzlmodrio-ni", version = "2024.2.1.bcr1") bazel_dep(name = "bzlmodrio-phoenix6", version = "24.0.0-beta-7") diff --git a/generate/get_phoenix_dependencies.py b/generate/get_phoenix_dependencies.py index 45104a8..3c56413 100644 --- a/generate/get_phoenix_dependencies.py +++ b/generate/get_phoenix_dependencies.py @@ -15,8 +15,8 @@ def get_phoenix_dependencies( use_local_ni=True, allwpilib_version_override="2024.1.1", phoenix6_version_override="24.0.0-beta-7", - opencv_version_override="2024.4.8.0-1", - ni_version_override="2024.2.1", + opencv_version_override="2024.4.8.0-4.bcr1", + ni_version_override="2024.2.1.bcr1", ): sim_install_name_classes = [ "simCANCoder", diff --git a/private/non_bzlmod_dependencies/download_dependencies.bzl b/private/non_bzlmod_dependencies/download_dependencies.bzl index 387371e..b335c85 100644 --- a/private/non_bzlmod_dependencies/download_dependencies.bzl +++ b/private/non_bzlmod_dependencies/download_dependencies.bzl @@ -43,15 +43,15 @@ def download_dependencies(): # bzlmodrio-opencv http_archive( name = "bzlmodrio-opencv", - sha256 = "761b152ef922e6bb386b79b06830fdf085b905d132d967c31d3ab4f33b8a8366", - url = "https://github.com/bzlmodRio/bzlmodRio-opencv/releases/download/2024.4.8.0-1/bzlmodRio-opencv-2024.4.8.0-1.tar.gz", + sha256 = "5314cce05b49451a46bf3e3140fc401342e53d5f3357612ed4473e59bb616cba", + url = "https://github.com/bzlmodRio/bzlmodRio-opencv/releases/download/2024.4.8.0-4.bcr1/bzlmodRio-opencv-2024.4.8.0-4.bcr1.tar.gz", ) # bzlmodrio-ni http_archive( name = "bzlmodrio-ni", - sha256 = "02a9b1d9722ad3cc7d55ee31a709938884d981f69634dfe93f92e3986bb7a43f", - url = "https://github.com/bzlmodRio/bzlmodRio-ni/releases/download/2024.2.1/bzlmodRio-ni-2024.2.1.tar.gz", + sha256 = "28abfa366389514669dabf9e71cc723749f650e98a689bf428ec1fc998ca5de9", + url = "https://github.com/bzlmodRio/bzlmodRio-ni/releases/download/2024.2.1.bcr1/bzlmodRio-ni-2024.2.1.bcr1.tar.gz", ) # bzlmodrio-phoenix6 diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel index 58dc792..845029d 100644 --- a/tests/MODULE.bazel +++ b/tests/MODULE.bazel @@ -11,7 +11,7 @@ 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 = "2024-1.bcr1") bazel_dep(name = "bzlmodrio-allwpilib", version = "2024.1.1") -bazel_dep(name = "bzlmodrio-opencv", version = "2024.4.8.0-1.bcr1") +bazel_dep(name = "bzlmodrio-opencv", version = "2024.4.8.0-4.bcr1") bazel_dep(name = "bzlmodrio-ni", version = "2024.2.1.bcr1") bazel_dep(name = "bzlmodrio-phoenix6", version = "24.0.0-beta-7") bazel_dep(name = "rules_pmd", version = "7.2.0")