Skip to content

Commit 4eb6a3e

Browse files
pjreinigerpjreiniger
authored
Update to 2025.4.10.0-3 (#28)
1 parent 1c9785b commit 4eb6a3e

15 files changed

+459
-408
lines changed

‎.bazelrc

+15-4
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,21 @@ build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
3333
build:bookworm64 --build_tag_filters=-no-bookworm
3434
build:bookworm64 --platform_suffix=bookworm64
3535

36-
# rasppi
37-
build:raspi32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspi32
38-
build:raspi32 --build_tag_filters=-no-raspi
39-
build:raspi32 --platform_suffix=raspi32
36+
# rasppi bullseye
37+
build:raspibullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibullseye32
38+
build:raspibullseye32 --build_tag_filters=-no-raspi
39+
build:raspibullseye32 --platform_suffix=raspibullseye32
40+
41+
# rasppi bookworm
42+
build:raspibookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibookworm32
43+
build:raspibookworm32 --build_tag_filters=-no-raspi
44+
build:raspibookworm32 --platform_suffix=raspibookworm32
45+
46+
# Alias toolchain names to what wpilibsuite uses for CI/Artifact naming
47+
build:athena --config=roborio
48+
build:systemcore --config=bookworm64
49+
build:linuxarm32 --config=raspibookworm32
50+
build:linuxarm64 --config=bookworm64
4051

4152
test --test_output=errors
4253
common --registry=https://raw.githubusercontent.com/pjreiniger/bazel-central-registry/bzlmodrio/

‎.bazelrc-cc

+9-4
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,12 @@ build:bookworm64 --incompatible_enable_cc_toolchain_resolution
6565
build:bookworm64 --copt=-std=c++20
6666
build:bookworm64 --features=compiler_param_file
6767

68-
# rasppi
69-
build:raspi32 --incompatible_enable_cc_toolchain_resolution
70-
build:raspi32 --copt=-std=c++20
71-
build:raspi32 --features=compiler_param_file
68+
# rasppi bullseye
69+
build:raspibullseye32 --incompatible_enable_cc_toolchain_resolution
70+
build:raspibullseye32 --copt=-std=c++20
71+
build:raspibullseye32 --features=compiler_param_file
72+
73+
# rasppi bookworm
74+
build:raspibookworm32 --incompatible_enable_cc_toolchain_resolution
75+
build:raspibookworm32 --copt=-std=c++20
76+
build:raspibookworm32 --features=compiler_param_file

‎.github/workflows/build.yml

+9-82
Original file line numberDiff line numberDiff line change
@@ -84,93 +84,20 @@ jobs:
8484
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
8585
working-directory: tests
8686

87-
build_bullseye32:
87+
build_linuxarm32:
8888
strategy:
8989
fail-fast: false
9090
matrix:
9191
include:
92-
# Build non-bzlmod, bullseye32
93-
- { name: "windows - bullseye32", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
94-
- { name: "ubuntu - bullseye32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "", }
95-
- { name: "macos - bullseye32", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bullseye32", bazel_options: "", }
92+
# Build non-bzlmod, linuxarm32
93+
- { name: "windows - linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", }
94+
- { name: "ubuntu - linuxarm32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm32", bazel_options: "", }
95+
- { name: "macos - linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=linuxarm32", bazel_options: "", }
9696

97-
# Build bzlmod, bullseye32
98-
- { name: "windows - bzlmod bullseye32", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "--output_user_root=C:\\bazelroot", }
99-
- { name: "ubuntu - bzlmod bullseye32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "", }
100-
- { name: "macos - bzlmod bullseye32", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bullseye32", bazel_options: "", }
101-
name: "Build - ${{ matrix.name }}"
102-
runs-on: ${{ matrix.os }}
103-
steps:
104-
- uses: actions/checkout@v4
105-
- uses: actions/setup-python@v5
106-
with: { python-version: '3.11' }
107-
- uses: actions/setup-java@v4
108-
with:
109-
distribution: 'zulu'
110-
java-version: 17
111-
architecture: ${{ matrix.java_arch }}
112-
- id: setup_build_buddy
113-
uses: ./.github/actions/setup-build-buddy
114-
with:
115-
token: ${{ secrets.BUILDBUDDY_API_KEY }}
116-
- name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around
117-
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci || true
118-
working-directory: tests
119-
- name: Build
120-
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
121-
working-directory: tests
122-
123-
124-
build_bullseye64:
125-
strategy:
126-
fail-fast: false
127-
matrix:
128-
include:
129-
# Build non-bzlmod, bullseye64:
130-
- { name: "windows - bullseye64", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
131-
- { name: "ubuntu - bullseye64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "", }
132-
- { name: "macos - bullseye64", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bullseye64", bazel_options: "", }
133-
134-
# Build bzlmod, bullseye64:
135-
- { name: "windows - bzlmod bullseye64", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "--output_user_root=C:\\bazelroot", }
136-
- { name: "ubuntu - bzlmod bullseye64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "", }
137-
- { name: "macos - bzlmod bullseye64", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bullseye64", bazel_options: "", }
138-
name: "Build - ${{ matrix.name }}"
139-
runs-on: ${{ matrix.os }}
140-
steps:
141-
- uses: actions/checkout@v4
142-
- uses: actions/setup-python@v5
143-
with: { python-version: '3.11' }
144-
- uses: actions/setup-java@v4
145-
with:
146-
distribution: 'zulu'
147-
java-version: 17
148-
architecture: ${{ matrix.java_arch }}
149-
- id: setup_build_buddy
150-
uses: ./.github/actions/setup-build-buddy
151-
with:
152-
token: ${{ secrets.BUILDBUDDY_API_KEY }}
153-
- name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around
154-
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci || true
155-
working-directory: tests
156-
- name: Build
157-
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
158-
working-directory: tests
159-
160-
build_bookworm64:
161-
strategy:
162-
fail-fast: false
163-
matrix:
164-
include:
165-
# Build non-bzlmod, bookworm64:
166-
- { name: "windows - bookworm64", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bookworm64", bazel_options: "--output_user_root=C:\\bazelroot", }
167-
- { name: "ubuntu - bookworm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bookworm64", bazel_options: "", }
168-
- { name: "macos - bookworm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bookworm64", bazel_options: "", }
169-
170-
# Build bzlmod, bookworm64:
171-
- { name: "windows - bzlmod bookworm64", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bookworm64", bazel_options: "--output_user_root=C:\\bazelroot", }
172-
- { name: "ubuntu - bzlmod bookworm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bookworm64", bazel_options: "", }
173-
- { name: "macos - bzlmod bookworm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bookworm64", bazel_options: "", }
97+
# Build bzlmod, linuxarm32
98+
# - { name: "windows - bzlmod linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", }
99+
- { name: "ubuntu - bzlmod linuxarm32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "", }
100+
- { name: "macos - bzlmod linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "", }
174101
name: "Build - ${{ matrix.name }}"
175102
runs-on: ${{ matrix.os }}
176103
steps:

‎MODULE.bazel

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module(
22
name = "bzlmodrio-opencv",
3-
version = "2025.4.10.0-2",
3+
version = "2025.4.10.0-3",
44
compatibility_level = 2025,
55
)
66

77
bazel_dep(name = "platforms", version = "0.0.9")
88
bazel_dep(name = "rules_cc", version = "0.0.9")
99
bazel_dep(name = "rules_java", version = "7.6.5")
10-
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1")
10+
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr1")
1111

1212
setup_bzlmodrio_opencv_cpp_dependencies = use_extension("//:maven_cpp_deps.bzl", "setup_bzlmodrio_opencv_cpp_dependencies")
1313
use_repo(
@@ -41,6 +41,10 @@ use_repo(
4141
"bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversaldebug",
4242
"bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversalstatic",
4343
"bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxuniversalstaticdebug",
44+
"bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64",
45+
"bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64debug",
46+
"bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64static",
47+
"bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_osxx86-64staticdebug",
4448
"bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_sources",
4549
"bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64",
4650
"bazelrio_edu_wpi_first_thirdparty_frc_opencv_opencv-cpp_windowsarm64debug",

‎libraries/cpp/opencv/BUILD.bazel

-8
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,12 @@ alias(
1313
alias(
1414
name = "static",
1515
actual = "@bzlmodrio-opencv//private/cpp/opencv:static",
16-
target_compatible_with = select({
17-
"@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
18-
"//conditions:default": [],
19-
}),
2016
visibility = ["//visibility:public"],
2117
)
2218

2319
alias(
2420
name = "shared",
2521
actual = "@bzlmodrio-opencv//private/cpp/opencv:shared",
26-
target_compatible_with = select({
27-
"@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
28-
"//conditions:default": [],
29-
}),
3022
visibility = ["//visibility:public"],
3123
)
3224

0 commit comments

Comments
 (0)