Regen

wpilibsuite · Sep 17, 2024 · 31fb97c · 31fb97c
1 parent ab9ffa2
commit 31fb97c
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 10 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,4 +1,6 @@
 try-import user.bazelrc
+try-import .buildbuddy-auth.rc
+
 import .bazelrc-cc
 import .bazelrc-java
 import .bazelrc-buildbuddy

diff --git a/.bazelrc-buildbuddy b/.bazelrc-buildbuddy
@@ -1,9 +1,16 @@
 build:remote --bes_results_url=https://app.buildbuddy.io/invocation/
 build:remote --bes_backend=grpcs://remote.buildbuddy.io
 build:remote --remote_cache=grpcs://remote.buildbuddy.io
-build:remote --remote_download_toplevel # Helps remove network bottleneck if caching is enabled
 build:remote --remote_timeout=3600
 
+# Additional suggestions from buildbuddy for speed
+build:remote --experimental_remote_cache_compression
+build:remote --experimental_remote_cache_compression_threshold=100
+build:remote --noslim_profile
+build:remote --experimental_profile_include_target_label
+build:remote --experimental_profile_include_primary_output
+build:remote --nolegacy_important_outputs
+
 build --experimental_inmemory_jdeps_files
 build --experimental_inmemory_dotd_files
 

diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-7.2.0
+7.3.1
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 bazel-*
 *.pyc
 user.bazelrc
+.buildbuddy-auth.rc
 .DS_Store
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -6,7 +6,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.1")
+bazel_dep(name = "rules_java", version = "7.6.5")
 bazel_dep(name = "rules_bazelrio", version = "0.0.14")
 bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1")
 

diff --git a/libraries/cpp/opencv/BUILD.bazel b/libraries/cpp/opencv/BUILD.bazel
@@ -4,6 +4,12 @@ alias(
     visibility = ["//visibility:public"],
 )
 
+alias(
+    name = "header_files",
+    actual = "@bzlmodrio-opencv//private/cpp/opencv:header_files",
+    visibility = ["//visibility:public"],
+)
+
 alias(
     name = "static",
     actual = "@bzlmodrio-opencv//private/cpp/opencv:static",
@@ -24,6 +30,12 @@ alias(
     visibility = ["//visibility:public"],
 )
 
+alias(
+    name = "shared_raw",
+    actual = "@bzlmodrio-opencv//private/cpp/opencv:shared_raw",
+    visibility = ["//visibility:public"],
+)
+
 alias(
     name = "jni",
     actual = "@bzlmodrio-opencv//private/cpp/opencv:jni",

diff --git a/maven_cpp_deps.bzl b/maven_cpp_deps.bzl
diff --git a/private/cpp/opencv/BUILD.bazel b/private/cpp/opencv/BUILD.bazel
@@ -18,8 +18,14 @@ cc_library(
     deps = ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_headers//:headers"],
 )
 
-cc_library(
-    name = "shared",
+alias(
+    name = "header_files",
+    actual = "@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_headers//:header_files",
+    visibility = ["@bzlmodrio-opencv//:__subpackages__"],
+)
+
+filegroup(
+    name = "shared_raw",
     srcs = select({
         "@rules_bazelrio//conditions:linux_x86_64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxx86-64//:shared"],
         "@rules_bazelrio//conditions:linux_x86_64_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxx86-64debug//:shared"],
@@ -36,6 +42,12 @@ cc_library(
         "@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"],
     }),
+    visibility = ["@bzlmodrio-opencv//:__subpackages__"],
+)
+
+cc_library(
+    name = "shared",
+    srcs = [":shared_raw"],
     target_compatible_with = select({
         "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
         "//conditions:default": [],

diff --git a/private/non_bzlmod_dependencies/download_dependencies.bzl b/private/non_bzlmod_dependencies/download_dependencies.bzl
@@ -4,8 +4,8 @@ def download_dependencies():
     # Rules Java
     http_archive(
         name = "rules_java",
-        sha256 = "f8ae9ed3887df02f40de9f4f7ac3873e6dd7a471f9cddf63952538b94b59aeb3",
-        url = "https://github.com/bazelbuild/rules_java/releases/download/7.6.1/rules_java-7.6.1.tar.gz",
+        sha256 = "8afd053dd2a7b85a4f033584f30a7f1666c5492c56c76e04eec4428bdb2a86cf",
+        url = "https://github.com/bazelbuild/rules_java/releases/download/7.6.5/rules_java-7.6.5.tar.gz",
     )
 
     # JVM External

diff --git a/tests/.bazelrc b/tests/.bazelrc
@@ -1,4 +1,6 @@
 try-import user.bazelrc
+try-import .buildbuddy-auth.rc
+
 import .bazelrc-cc
 import .bazelrc-java
 import .bazelrc-buildbuddy

diff --git a/tests/.bazelrc-buildbuddy b/tests/.bazelrc-buildbuddy
@@ -1,9 +1,16 @@
 build:remote --bes_results_url=https://app.buildbuddy.io/invocation/
 build:remote --bes_backend=grpcs://remote.buildbuddy.io
 build:remote --remote_cache=grpcs://remote.buildbuddy.io
-build:remote --remote_download_toplevel # Helps remove network bottleneck if caching is enabled
 build:remote --remote_timeout=3600
 
+# Additional suggestions from buildbuddy for speed
+build:remote --experimental_remote_cache_compression
+build:remote --experimental_remote_cache_compression_threshold=100
+build:remote --noslim_profile
+build:remote --experimental_profile_include_target_label
+build:remote --experimental_profile_include_primary_output
+build:remote --nolegacy_important_outputs
+
 build --experimental_inmemory_jdeps_files
 build --experimental_inmemory_dotd_files
 

diff --git a/tests/.bazelversion b/tests/.bazelversion
@@ -1 +1 @@
-7.2.0
+7.3.1
diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel
@@ -6,7 +6,7 @@ local_path_override(
 
 bazel_dep(name = "googletest", version = "1.14.0")
 bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_java", version = "7.6.1")
+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 = "2024-1")