From ffd94ecc8c41d05b9f57a21637e77f5b94659d58 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 14 Jan 2025 01:16:27 -0500 Subject: [PATCH 1/5] Start testing systemcore --- .bazelrc | 24 ++-- .bazelrc-cc | 11 +- .github/workflows/build.yml | 72 ++++++++++ MODULE.bazel.lock | 5 +- private/cpp/opencv/BUILD.bazel | 6 + .../download_dependencies.bzl | 6 +- .../setup_dependencies.bzl | 9 +- tests/.bazelrc | 24 ++-- tests/.bazelrc-cc | 11 +- tests/MODULE.bazel | 11 ++ tests/MODULE.bazel.lock | 133 +++++++++++++++++- tests/WORKSPACE | 1 + 12 files changed, 273 insertions(+), 40 deletions(-) diff --git a/.bazelrc b/.bazelrc index 224e3f7..b2c4d2f 100644 --- a/.bazelrc +++ b/.bazelrc @@ -8,44 +8,48 @@ import .bazelrc-buildbuddy build --test_env=LD_LIBRARY_PATH=. build --test_env=DYLD_LIBRARY_PATH=. -# Roborio +# roborio build:roborio --platforms=@rules_bzlmodrio_toolchains//platforms/roborio build:roborio --build_tag_filters=-no-roborio build:roborio --platform_suffix=roborio +# systemcore +build:systemcore --platforms=@rules_bzlmodrio_toolchains//platforms/systemcore +build:systemcore --build_tag_filters=-no-systemcore +build:systemcore --platform_suffix=systemcore + # bullseye32 build:bullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye32 -build:bullseye32 --build_tag_filters=-no-bullseye +build:bullseye32 --build_tag_filters=-no-bullseye32 build:bullseye32 --platform_suffix=bullseye32 # bullseye64 build:bullseye64 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye64 -build:bullseye64 --build_tag_filters=-no-bullseye +build:bullseye64 --build_tag_filters=-no-bullseye64 build:bullseye64 --platform_suffix=bullseye64 # bookworm32 build:bookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm32 -build:bookworm32 --build_tag_filters=-no-bookworm +build:bookworm32 --build_tag_filters=-no-bookworm32 build:bookworm32 --platform_suffix=bookworm32 # bookworm64 build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64 -build:bookworm64 --build_tag_filters=-no-bookworm +build:bookworm64 --build_tag_filters=-no-bookworm64 build:bookworm64 --platform_suffix=bookworm64 -# rasppi bullseye +# raspibullseye32 build:raspibullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibullseye32 -build:raspibullseye32 --build_tag_filters=-no-raspi +build:raspibullseye32 --build_tag_filters=-no-raspibullseye32 build:raspibullseye32 --platform_suffix=raspibullseye32 -# rasppi bookworm +# raspibookworm32 build:raspibookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibookworm32 -build:raspibookworm32 --build_tag_filters=-no-raspi +build:raspibookworm32 --build_tag_filters=-no-raspibookworm32 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 diff --git a/.bazelrc-cc b/.bazelrc-cc index aafcf41..362fdd5 100644 --- a/.bazelrc-cc +++ b/.bazelrc-cc @@ -40,11 +40,16 @@ build:macos --cxxopt=-Wno-error=deprecated-anon-enum-enum-conversion build:macos --cxxopt=-Wno-error=inconsistent-missing-override build:macos --cxxopt=-Wno-error=overloaded-virtual -# Roborio +# roborio build:roborio --incompatible_enable_cc_toolchain_resolution build:roborio --copt=-std=c++20 build:roborio --features=compiler_param_file +# systemcore +build:systemcore --incompatible_enable_cc_toolchain_resolution +build:systemcore --copt=-std=c++20 +build:systemcore --features=compiler_param_file + # bullseye32 build:bullseye32 --incompatible_enable_cc_toolchain_resolution build:bullseye32 --copt=-std=c++20 @@ -65,12 +70,12 @@ build:bookworm64 --incompatible_enable_cc_toolchain_resolution build:bookworm64 --copt=-std=c++20 build:bookworm64 --features=compiler_param_file -# rasppi bullseye +# raspibullseye32 build:raspibullseye32 --incompatible_enable_cc_toolchain_resolution build:raspibullseye32 --copt=-std=c++20 build:raspibullseye32 --features=compiler_param_file -# rasppi bookworm +# raspibookworm32 build:raspibookworm32 --incompatible_enable_cc_toolchain_resolution build:raspibookworm32 --copt=-std=c++20 build:raspibookworm32 --features=compiler_param_file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 689aaf3..404d87b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -84,6 +84,42 @@ jobs: run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci working-directory: tests + build_systemcore: + strategy: + fail-fast: false + matrix: + include: + # Build non-bzlmod, systemcore + - { name: "windows - systemcore", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=systemcore", bazel_options: "--output_user_root=C:\\bazelroot", } + - { name: "ubuntu - systemcore", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=systemcore", bazel_options: "", } + - { name: "macos - systemcore", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=systemcore", bazel_options: "", } + + # Build bzlmod, systemcore + # - { name: "windows - bzlmod systemcore", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=systemcore", bazel_options: "--output_user_root=C:\\bazelroot", } + - { name: "ubuntu - bzlmod systemcore", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=systemcore", bazel_options: "", } + - { name: "macos - bzlmod systemcore", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=systemcore", 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_linuxarm32: strategy: fail-fast: false @@ -119,3 +155,39 @@ jobs: - name: Build run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci working-directory: tests + + build_linuxarm64: + strategy: + fail-fast: false + matrix: + include: + # Build non-bzlmod, linuxarm64 + - { name: "windows - linuxarm64", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm64", bazel_options: "--output_user_root=C:\\bazelroot", } + - { name: "ubuntu - linuxarm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm64", bazel_options: "", } + - { name: "macos - linuxarm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=linuxarm64", bazel_options: "", } + + # Build bzlmod, linuxarm64 + - { name: "windows - bzlmod linuxarm64", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "--output_user_root=C:\\bazelroot", } + - { name: "ubuntu - bzlmod linuxarm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "", } + - { name: "macos - bzlmod linuxarm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=linuxarm64", 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 diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index b3795d8..1ba3fee 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -12,7 +12,6 @@ "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/bazel_skylib/1.0.3/MODULE.bazel": "bcb0fd896384802d1ad283b4e4eb4d718eebd8cb820b0a2c3a347fb971afd9d8", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/bazel_skylib/1.2.1/MODULE.bazel": "f35baf9da0efe45fa3da1696ae906eea3d615ad41e2e3def4aeb4e8bc0ef9a7a", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/bazel_skylib/1.3.0/MODULE.bazel": "20228b92868bf5cfc41bda7afc8a8ba2a543201851de39d990ec957b513579c5", - "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/bazel_skylib/1.4.2/MODULE.bazel": "3bd40978e7a1fac911d5989e6b09d8f64921865a45822d8b09e815eaa726a651", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/bazel_skylib/1.6.1/MODULE.bazel": "8fdee2dbaace6c252131c00e1de4b165dc65af02ea278476187765e1a617b917", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/bazel_skylib/1.6.1/source.json": "082ed5f9837901fada8c68c2f3ddc958bb22b6d654f71dd73f3df30d45d4b749", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84", @@ -29,8 +28,8 @@ "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/protobuf/21.7/source.json": "bbe500720421e582ff2d18b0802464205138c06056f443184de39fbb8187b09b", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/protobuf/3.19.0/MODULE.bazel": "6b5fbb433f760a99a22b18b6850ed5784ef0e9928a72668b66e4d7ccd47db9b0", "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/protobuf/3.19.6/MODULE.bazel": "9233edc5e1f2ee276a60de3eaa47ac4132302ef9643238f23128fea53ea12858", - "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_bzlmodrio_toolchains/2024-1.bcr1/MODULE.bazel": "c9eb05f0f01e748a5d923d56e6f846f01c630e823f01d79d40f2b04638cc43f7", - "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_bzlmodrio_toolchains/2024-1.bcr1/source.json": "ede33537e659d196e38226a94a3d8543b739f38f7ced571745cb469f6adebd02", + "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_bzlmodrio_toolchains/2025-1.bcr1/MODULE.bazel": "a4251b7577b3e1dcdf5ac97363672a79d0a000dffae768df5997e1489a0440db", + "https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/modules/rules_bzlmodrio_toolchains/2025-1.bcr1/source.json": "383845de7921f624b577b821419b3e024f8c91393b6f9b201103180447e99693", "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.8/MODULE.bazel": "964c85c82cfeb6f3855e6a07054fdb159aced38e99a5eecf7bce9d53990afa3e", diff --git a/private/cpp/opencv/BUILD.bazel b/private/cpp/opencv/BUILD.bazel index 2d9b639..a547968 100644 --- a/private/cpp/opencv/BUILD.bazel +++ b/private/cpp/opencv/BUILD.bazel @@ -37,6 +37,8 @@ filegroup( "@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"], + "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcore//:shared"], + "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcoredebug//:shared"], "//conditions:default": [], }), visibility = ["@bzlmodrio-opencv//:__subpackages__"], @@ -72,6 +74,8 @@ cc_library( "@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"], + "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcorestatic//:static_libs"], + "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcorestaticdebug//:static_libs"], }), ) @@ -92,6 +96,8 @@ cc_library( "@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"], + "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcore//:jni"], + "@rules_bzlmodrio_toolchains//constraints/is_systemcore:systemcore_debug": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxsystemcoredebug//:jni"], }), linkstatic = 1, visibility = ["@bzlmodrio-opencv//:__subpackages__"], diff --git a/private/non_bzlmod_dependencies/download_dependencies.bzl b/private/non_bzlmod_dependencies/download_dependencies.bzl index 388022f..fa28631 100644 --- a/private/non_bzlmod_dependencies/download_dependencies.bzl +++ b/private/non_bzlmod_dependencies/download_dependencies.bzl @@ -24,10 +24,12 @@ def download_dependencies(): ) # Roborio Toolchain + # TODO - TEMPORARY OVERRIDE http_archive( name = "rules_bzlmodrio_toolchains", - sha256 = "559ff5ddc402dca6266a765770c3a65db23e2060c45355c57612737bcc592b78", - url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1.bcr1/rules_bzlmodRio_toolchains-2025-1.bcr1.tar.gz", + integrity = "sha256-45EV1waPl/X8S1LocEDpYD6W3XMsX5W3f/1cLPS/VK8=", + strip_prefix = "rules_bzlmodrio_toolchains-696c423fd86e9dd0dfbf17fb151295ddf1a03468", + urls = ["https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/archive/696c423fd86e9dd0dfbf17fb151295ddf1a03468.tar.gz"], ) ######################## diff --git a/private/non_bzlmod_dependencies/setup_dependencies.bzl b/private/non_bzlmod_dependencies/setup_dependencies.bzl index 48d2a35..ecc09eb 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_bookworm_32//:macos", - "@local_raspi_bookworm_32//:linux", - "@local_raspi_bookworm_32//:windows", + "@local_systemcore//:macos", + "@local_systemcore//:linux", + "@local_systemcore//:windows", + "@local_raspi_bullseye32//:macos", + "@local_raspi_bullseye32//:linux", + "@local_raspi_bullseye32//:windows", "@local_raspi_bookworm_32//:macos", "@local_raspi_bookworm_32//:linux", "@local_raspi_bookworm_32//:windows", diff --git a/tests/.bazelrc b/tests/.bazelrc index 224e3f7..b2c4d2f 100644 --- a/tests/.bazelrc +++ b/tests/.bazelrc @@ -8,44 +8,48 @@ import .bazelrc-buildbuddy build --test_env=LD_LIBRARY_PATH=. build --test_env=DYLD_LIBRARY_PATH=. -# Roborio +# roborio build:roborio --platforms=@rules_bzlmodrio_toolchains//platforms/roborio build:roborio --build_tag_filters=-no-roborio build:roborio --platform_suffix=roborio +# systemcore +build:systemcore --platforms=@rules_bzlmodrio_toolchains//platforms/systemcore +build:systemcore --build_tag_filters=-no-systemcore +build:systemcore --platform_suffix=systemcore + # bullseye32 build:bullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye32 -build:bullseye32 --build_tag_filters=-no-bullseye +build:bullseye32 --build_tag_filters=-no-bullseye32 build:bullseye32 --platform_suffix=bullseye32 # bullseye64 build:bullseye64 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye64 -build:bullseye64 --build_tag_filters=-no-bullseye +build:bullseye64 --build_tag_filters=-no-bullseye64 build:bullseye64 --platform_suffix=bullseye64 # bookworm32 build:bookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm32 -build:bookworm32 --build_tag_filters=-no-bookworm +build:bookworm32 --build_tag_filters=-no-bookworm32 build:bookworm32 --platform_suffix=bookworm32 # bookworm64 build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64 -build:bookworm64 --build_tag_filters=-no-bookworm +build:bookworm64 --build_tag_filters=-no-bookworm64 build:bookworm64 --platform_suffix=bookworm64 -# rasppi bullseye +# raspibullseye32 build:raspibullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibullseye32 -build:raspibullseye32 --build_tag_filters=-no-raspi +build:raspibullseye32 --build_tag_filters=-no-raspibullseye32 build:raspibullseye32 --platform_suffix=raspibullseye32 -# rasppi bookworm +# raspibookworm32 build:raspibookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibookworm32 -build:raspibookworm32 --build_tag_filters=-no-raspi +build:raspibookworm32 --build_tag_filters=-no-raspibookworm32 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 diff --git a/tests/.bazelrc-cc b/tests/.bazelrc-cc index aafcf41..362fdd5 100644 --- a/tests/.bazelrc-cc +++ b/tests/.bazelrc-cc @@ -40,11 +40,16 @@ build:macos --cxxopt=-Wno-error=deprecated-anon-enum-enum-conversion build:macos --cxxopt=-Wno-error=inconsistent-missing-override build:macos --cxxopt=-Wno-error=overloaded-virtual -# Roborio +# roborio build:roborio --incompatible_enable_cc_toolchain_resolution build:roborio --copt=-std=c++20 build:roborio --features=compiler_param_file +# systemcore +build:systemcore --incompatible_enable_cc_toolchain_resolution +build:systemcore --copt=-std=c++20 +build:systemcore --features=compiler_param_file + # bullseye32 build:bullseye32 --incompatible_enable_cc_toolchain_resolution build:bullseye32 --copt=-std=c++20 @@ -65,12 +70,12 @@ build:bookworm64 --incompatible_enable_cc_toolchain_resolution build:bookworm64 --copt=-std=c++20 build:bookworm64 --features=compiler_param_file -# rasppi bullseye +# raspibullseye32 build:raspibullseye32 --incompatible_enable_cc_toolchain_resolution build:raspibullseye32 --copt=-std=c++20 build:raspibullseye32 --features=compiler_param_file -# rasppi bookworm +# raspibookworm32 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 757f127..c12d182 100644 --- a/tests/MODULE.bazel +++ b/tests/MODULE.bazel @@ -10,12 +10,23 @@ 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.bcr1") + +# TODO - TEMPORARY OVERRIDE +archive_override( + module_name = "rules_bzlmodrio_toolchains", + integrity = "sha256-45EV1waPl/X8S1LocEDpYD6W3XMsX5W3f/1cLPS/VK8=", + strip_prefix = "rules_bzlmodrio_toolchains-696c423fd86e9dd0dfbf17fb151295ddf1a03468", + urls = ["https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/archive/696c423fd86e9dd0dfbf17fb151295ddf1a03468.tar.gz"], +) + 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") 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") + +# TODO - TEMPORARY OVERRIDE archive_override( module_name = "rules_bzlmodrio_jdk", integrity = "sha256-SrikyrF2v2lENdqn9aFC//d0TkIE620lR60yXTrWFTs=", diff --git a/tests/MODULE.bazel.lock b/tests/MODULE.bazel.lock index 883b085..2a08f04 100644 --- a/tests/MODULE.bazel.lock +++ b/tests/MODULE.bazel.lock @@ -125,7 +125,7 @@ }, "@@bzlmodrio-opencv~//:maven_cpp_deps.bzl%setup_bzlmodrio_opencv_cpp_dependencies": { "general": { - "bzlTransitiveDigest": "5epfu0xq95H5uSOmG7RPqbuh+iWbq/sPSuBsjmO7o9I=", + "bzlTransitiveDigest": "kmiXrZrHq7vGj8WmcQNpi8WxZtKfNjwaTpmlC1p3Q0g=", "usagesDigest": "mAP4cxp7apQKc/irj3rRnf+z+XnE+ck5LSbmkYfIG3c=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -140,6 +140,15 @@ "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-3/opencv-cpp-4.10.0-3-linuxsystemcore.zip", + "sha256": "bd8f19fdd16291ba940cbccc68dee737ecc74c0035adfe75165c6aa2b5734afd", + "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" + } + }, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32staticdebug": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", @@ -257,6 +266,15 @@ "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64debug": { + "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-3/opencv-cpp-4.10.0-3-osxx86-64debug.zip", + "sha256": "9e9a695d428b2ede69faf801b0152c23256384b543ff8768300f97298caa960a", + "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" + } + }, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxathenastaticdebug": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", @@ -293,6 +311,24 @@ "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-3/opencv-cpp-4.10.0-3-linuxsystemcorestatic.zip", + "sha256": "a97b3e9326a6c7aa6ee97233495540b382a312fa57bd02b8d11b21703937e5e9", + "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" + } + }, + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64": { + "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-3/opencv-cpp-4.10.0-3-osxx86-64.zip", + "sha256": "4aaef18a3074c2db17721844c205df13d27f015e204514216c436adfcd6290dc", + "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" + } + }, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsx86-64static": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", @@ -347,6 +383,15 @@ "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-3/opencv-cpp-4.10.0-3-linuxsystemcorestaticdebug.zip", + "sha256": "455880a03db5e5af9bf337526eca065b59d3aa670ff2b1e4d055cec71339db72", + "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", @@ -419,6 +464,24 @@ "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" } }, + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64staticdebug": { + "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-3/opencv-cpp-4.10.0-3-osxx86-64staticdebug.zip", + "sha256": "6ebd2d2fa123085ac261b539df9c6fd01536660ca21fdebfa60f3eedd7d78359", + "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" + } + }, + "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64static": { + "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-3/opencv-cpp-4.10.0-3-osxx86-64static.zip", + "sha256": "53c01641c2106b802a4cce85ff12f80c4cf4eaecdfeb0b26a3e15b44c61cb34d", + "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:static.BUILD.bazel" + } + }, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxarm32": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", @@ -446,6 +509,15 @@ "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-3/opencv-cpp-4.10.0-3-linuxsystemcoredebug.zip", + "sha256": "b384fcfc4d5b060dd26f4518f5782ab5e21a82b9be26656861eb031fe6df1193", + "build_file": "@@bzlmodrio-opencv~//private/cpp/opencv:shared.BUILD.bazel" + } + }, "bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", @@ -672,8 +744,8 @@ }, "@@rules_bzlmodrio_toolchains~//:extensions.bzl%sh_configure": { "general": { - "bzlTransitiveDigest": "zxxMdXovSVhpaYfsRxxzd4xDCDbckI5u0oP1hWbmfyg=", - "usagesDigest": "uonolgw+fRKloO6hqlkUNhn2dgbGC3sUZiZUqJYf9jY=", + "bzlTransitiveDigest": "FSzzLax1FSAilvZicvnhrjs+SiDm3CUZEJoKp8eiL2s=", + "usagesDigest": "ZuybEXe3p64B/EeVUmrfjvXGd60Ad75CUCRBRLEbeLs=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -725,7 +797,7 @@ "bin_subfolder": "raspi-bookworm/bin", "bin_prefix": "armv6-bookworm-linux-gnueabihf-", "sysroot_subfolder": "raspi-bookworm/arm-linux-gnueabihf/sysroot", - "cxx_version": "10", + "cxx_version": "12", "sysroot_include_folder": "arm-linux-gnueabihf", "repo_shortname": "raspi_bookworm_32" } @@ -768,6 +840,19 @@ "sysroot_include_folder": "arm-linux-gnueabihf", "repo_shortname": "raspi_bullseye_32" } + }, + "local_systemcore": { + "bzlFile": "@@rules_bzlmodrio_toolchains~//toolchains:configure_cross_compiler.bzl", + "ruleClassName": "configure_cross_compiler", + "attributes": { + "compiler": "systemcore", + "bin_subfolder": "bookworm/bin", + "bin_prefix": "aarch64-bookworm-linux-gnu-", + "sysroot_subfolder": "bookworm/aarch64-linux-gnu/sysroot", + "cxx_version": "12", + "sysroot_include_folder": "aarch64-linux-gnu", + "repo_shortname": "systemcore" + } } }, "recordedRepoMappingEntries": [] @@ -775,8 +860,8 @@ }, "@@rules_bzlmodrio_toolchains~//:maven_deps.bzl%deps": { "general": { - "bzlTransitiveDigest": "GM0I8AartRlE8RSwTMG7A4F3pL0nggDUq3Cw0mJCCyo=", - "usagesDigest": "4/3/JS7eRFlnL/LaNaWtSvAotjn9NVmTvf0dYduyXNo=", + "bzlTransitiveDigest": "LcB0cBNMQrWFxhP5QvOW1tGUT4VY+4Y43sfw/LuyGrs=", + "usagesDigest": "URGXGPy9UNtjhZToCcyGfIWzms2OFDbp32AF6EYcOYE=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -844,6 +929,15 @@ "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, + "bazelrio_systemcore_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-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" + } + }, "bazelrio_bookworm_32_toolchain_windows": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", @@ -916,6 +1010,15 @@ "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, + "bazelrio_systemcore_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_bullseye_32_toolchain_macosarm": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", @@ -925,6 +1028,15 @@ "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, + "bazelrio_systemcore_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", + "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", @@ -934,6 +1046,15 @@ "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" } }, + "bazelrio_systemcore_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", + "build_file_content": "filegroup(\n name = \"all\",\n srcs = glob([\"**\"]),\n visibility = [\"//visibility:public\"],\n)\n" + } + }, "bazelrio_bullseye_64_toolchain_linux": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", diff --git a/tests/WORKSPACE b/tests/WORKSPACE index 6cbb6af..20c86b1 100644 --- a/tests/WORKSPACE +++ b/tests/WORKSPACE @@ -79,6 +79,7 @@ load("@rules_wpi_styleguide//dependencies:load_pins.bzl", "load_styleguide_pins" load_styleguide_pins() ##################### +# TODO - TEMPORARY OVERRIDE http_archive( name = "rules_bzlmodrio_jdk", integrity = "sha256-SrikyrF2v2lENdqn9aFC//d0TkIE620lR60yXTrWFTs=", From 5eb23266e7b419de5337af243e4a388899ad3e43 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 14 Jan 2025 01:53:26 -0500 Subject: [PATCH 2/5] Fixup --- private/non_bzlmod_dependencies/setup_dependencies.bzl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/private/non_bzlmod_dependencies/setup_dependencies.bzl b/private/non_bzlmod_dependencies/setup_dependencies.bzl index ecc09eb..9afff54 100644 --- a/private/non_bzlmod_dependencies/setup_dependencies.bzl +++ b/private/non_bzlmod_dependencies/setup_dependencies.bzl @@ -17,9 +17,9 @@ def _setup_toolchains(): "@local_systemcore//:macos", "@local_systemcore//:linux", "@local_systemcore//:windows", - "@local_raspi_bullseye32//:macos", - "@local_raspi_bullseye32//:linux", - "@local_raspi_bullseye32//:windows", + "@local_raspi_bullseye_32//:macos", + "@local_raspi_bullseye_32//:linux", + "@local_raspi_bullseye_32//:windows", "@local_raspi_bookworm_32//:macos", "@local_raspi_bookworm_32//:linux", "@local_raspi_bookworm_32//:windows", From ba45de64607bcf369d9b6995bca676ef905f297b Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 14 Jan 2025 02:01:32 -0500 Subject: [PATCH 3/5] Add windows build back in --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 404d87b..43e9fbf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,7 +95,7 @@ jobs: - { name: "macos - systemcore", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=systemcore", bazel_options: "", } # Build bzlmod, systemcore - # - { name: "windows - bzlmod systemcore", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=systemcore", bazel_options: "--output_user_root=C:\\bazelroot", } + - { name: "windows - bzlmod systemcore", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=systemcore", bazel_options: "--output_user_root=C:\\bazelroot", } - { name: "ubuntu - bzlmod systemcore", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=systemcore", bazel_options: "", } - { name: "macos - bzlmod systemcore", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=systemcore", bazel_options: "", } name: "Build - ${{ matrix.name }}" From f0cce67c836ae73b83f7756a74b8ca4e01e66419 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Tue, 14 Jan 2025 03:01:25 -0500 Subject: [PATCH 4/5] Regen --- tests/MODULE.bazel | 2 -- tests/WORKSPACE | 1 - 2 files changed, 3 deletions(-) diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel index c12d182..131275e 100644 --- a/tests/MODULE.bazel +++ b/tests/MODULE.bazel @@ -25,8 +25,6 @@ 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") - -# TODO - TEMPORARY OVERRIDE archive_override( module_name = "rules_bzlmodrio_jdk", integrity = "sha256-SrikyrF2v2lENdqn9aFC//d0TkIE620lR60yXTrWFTs=", diff --git a/tests/WORKSPACE b/tests/WORKSPACE index 20c86b1..6cbb6af 100644 --- a/tests/WORKSPACE +++ b/tests/WORKSPACE @@ -79,7 +79,6 @@ load("@rules_wpi_styleguide//dependencies:load_pins.bzl", "load_styleguide_pins" load_styleguide_pins() ##################### -# TODO - TEMPORARY OVERRIDE http_archive( name = "rules_bzlmodrio_jdk", integrity = "sha256-SrikyrF2v2lENdqn9aFC//d0TkIE620lR60yXTrWFTs=", From c447772d25b1884634a83e94d918bfeb81fa4b54 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Wed, 15 Jan 2025 19:13:58 -0500 Subject: [PATCH 5/5] update version --- MODULE.bazel | 4 ++-- .../non_bzlmod_dependencies/download_dependencies.bzl | 6 ++---- tests/MODULE.bazel | 11 +---------- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index b2dc040..c02598a 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,13 +1,13 @@ module( name = "bzlmodrio-opencv", - version = "2025.4.10.0-3", + version = "2025.4.10.0-3.bcr1", compatibility_level = 2025, ) 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.bcr1") +bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr2") 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 fa28631..832f312 100644 --- a/private/non_bzlmod_dependencies/download_dependencies.bzl +++ b/private/non_bzlmod_dependencies/download_dependencies.bzl @@ -24,12 +24,10 @@ def download_dependencies(): ) # Roborio Toolchain - # TODO - TEMPORARY OVERRIDE http_archive( name = "rules_bzlmodrio_toolchains", - integrity = "sha256-45EV1waPl/X8S1LocEDpYD6W3XMsX5W3f/1cLPS/VK8=", - strip_prefix = "rules_bzlmodrio_toolchains-696c423fd86e9dd0dfbf17fb151295ddf1a03468", - urls = ["https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/archive/696c423fd86e9dd0dfbf17fb151295ddf1a03468.tar.gz"], + sha256 = "ff25b5f9445cbd43759be4c6582b987d1065cf817c593eedc7ada1a699298c84", + url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1.bcr2/rules_bzlmodRio_toolchains-2025-1.bcr2.tar.gz", ) ######################## diff --git a/tests/MODULE.bazel b/tests/MODULE.bazel index 131275e..f7d9e88 100644 --- a/tests/MODULE.bazel +++ b/tests/MODULE.bazel @@ -9,16 +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.bcr1") - -# TODO - TEMPORARY OVERRIDE -archive_override( - module_name = "rules_bzlmodrio_toolchains", - integrity = "sha256-45EV1waPl/X8S1LocEDpYD6W3XMsX5W3f/1cLPS/VK8=", - strip_prefix = "rules_bzlmodrio_toolchains-696c423fd86e9dd0dfbf17fb151295ddf1a03468", - urls = ["https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/archive/696c423fd86e9dd0dfbf17fb151295ddf1a03468.tar.gz"], -) - +bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr2") 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")