Update to 2025.4.10.0-3 (#28)

wpilibsuite · Jan 4, 2025 · 4eb6a3e · 4eb6a3e
1 parent 1c9785b
commit 4eb6a3e
Show file tree

Hide file tree

Showing 15 changed files with 459 additions and 408 deletions.
diff --git 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
@@ -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/.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/MODULE.bazel b/MODULE.bazel
@@ -1,13 +1,13 @@
 module(
     name = "bzlmodrio-opencv",
-    version = "2025.4.10.0-2",
+    version = "2025.4.10.0-3",
     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")
+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(
@@ -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
@@ -13,20 +13,12 @@ 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"],
 )
 
 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"],
 )