Fixup

wpilibsuite · Jan 1, 2025 · 48b1fb9 · 48b1fb9
1 parent 669ddd2
commit 48b1fb9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 90 deletions.
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/libraries/cpp/opencv/BUILD.bazel b/libraries/cpp/opencv/BUILD.bazel
@@ -13,10 +13,6 @@ 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"],
 )
 

diff --git a/private/cpp/opencv/BUILD.bazel b/private/cpp/opencv/BUILD.bazel
@@ -56,10 +56,6 @@ cc_library(
 cc_library(
     name = "static",
     linkstatic = 1,
-    target_compatible_with = select({
-        "@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
-        "//conditions:default": [],
-    }),
     visibility = ["@bzlmodrio-opencv//:__subpackages__"],
     deps = ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_headers//:headers"] + select({
         "@rules_bzlmodrio_toolchains//conditions:linux_x86_64": ["@bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_linuxx86-64static//:static_libs"],