Skip to content

Commit 8b19e6e

Browse files
pjreinigerpjreiniger
authored
Update to 2025.2.0 (#24)
1 parent 0c17a14 commit 8b19e6e

File tree

17 files changed

+467
-113
lines changed

17 files changed

+467
-113
lines changed

‎.bazelrc‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,31 @@ build:bullseye64 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye64
2323
build:bullseye64 --build_tag_filters=-no-bullseye
2424
build:bullseye64 --platform_suffix=bullseye64
2525

26-
# rasppi
27-
build:raspi32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspi32
28-
build:raspi32 --build_tag_filters=-no-raspi
29-
build:raspi32 --platform_suffix=raspi32
26+
# bookworm32
27+
build:bookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm32
28+
build:bookworm32 --build_tag_filters=-no-bookworm
29+
build:bookworm32 --platform_suffix=bookworm32
30+
31+
# bookworm64
32+
build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
33+
build:bookworm64 --build_tag_filters=-no-bookworm
34+
build:bookworm64 --platform_suffix=bookworm64
35+
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
3051

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

‎.bazelrc-cc‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,22 @@ build:bullseye64 --incompatible_enable_cc_toolchain_resolution
5555
build:bullseye64 --copt=-std=c++20
5656
build:bullseye64 --features=compiler_param_file
5757

58-
# rasppi
59-
build:raspi32 --incompatible_enable_cc_toolchain_resolution
60-
build:raspi32 --copt=-std=c++20
61-
build:raspi32 --features=compiler_param_file
58+
# bookworm32
59+
build:bookworm32 --incompatible_enable_cc_toolchain_resolution
60+
build:bookworm32 --copt=-std=c++20
61+
build:bookworm32 --features=compiler_param_file
62+
63+
# bookworm64
64+
build:bookworm64 --incompatible_enable_cc_toolchain_resolution
65+
build:bookworm64 --copt=-std=c++20
66+
build:bookworm64 --features=compiler_param_file
67+
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

‎.clang-format‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
Language: Cpp
3+
BasedOnStyle: Google
4+
FixNamespaceComments: true
5+
...

‎.github/workflows/build.yml‎

Lines changed: 9 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -84,57 +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, bullseye32:
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=bullseye32", bazel_options: "", }
133-
134-
# Build bzlmod, bullseye32:
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: "", }
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: "", }
138101
name: "Build - ${{ matrix.name }}"
139102
runs-on: ${{ matrix.os }}
140103
steps:

‎MODULE.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module(
22
name = "bzlmodrio-ni",
3-
version = "2025.0.0",
3+
version = "2025.2.0",
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 = "2024-1.bcr1")
10+
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr1")
1111

1212
setup_bzlmodrio_ni_cpp_dependencies = use_extension("//:maven_cpp_deps.bzl", "setup_bzlmodrio_ni_cpp_dependencies")
1313
use_repo(

‎maven_cpp_deps.bzl‎

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎private/cpp/chipobject/BUILD.bazel‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ cc_library(
2222
"@bazel_tools//src/conditions:darwin": ["@platforms//:incompatible"],
2323
"@bazel_tools//src/conditions:linux_x86_64": ["@platforms//:incompatible"],
2424
"@bazel_tools//src/conditions:windows": ["@platforms//:incompatible"],
25-
"@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32": ["@platforms//:incompatible"],
26-
"@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64": ["@platforms//:incompatible"],
27-
"@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
25+
"@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@platforms//:incompatible"],
26+
"@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32": ["@platforms//:incompatible"],
2827
"//conditions:default": [],
2928
}),
3029
visibility = ["@bzlmodrio-ni//:__subpackages__"],

‎private/cpp/netcomm/BUILD.bazel‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ cc_library(
2222
"@bazel_tools//src/conditions:darwin": ["@platforms//:incompatible"],
2323
"@bazel_tools//src/conditions:linux_x86_64": ["@platforms//:incompatible"],
2424
"@bazel_tools//src/conditions:windows": ["@platforms//:incompatible"],
25-
"@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32": ["@platforms//:incompatible"],
26-
"@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64": ["@platforms//:incompatible"],
27-
"@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
25+
"@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@platforms//:incompatible"],
26+
"@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32": ["@platforms//:incompatible"],
2827
"//conditions:default": [],
2928
}),
3029
visibility = ["@bzlmodrio-ni//:__subpackages__"],

‎private/cpp/runtime/BUILD.bazel‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ cc_library(
1616
"@bazel_tools//src/conditions:darwin": ["@platforms//:incompatible"],
1717
"@bazel_tools//src/conditions:linux_x86_64": ["@platforms//:incompatible"],
1818
"@bazel_tools//src/conditions:windows": ["@platforms//:incompatible"],
19-
"@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32": ["@platforms//:incompatible"],
20-
"@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64": ["@platforms//:incompatible"],
21-
"@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
19+
"@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@platforms//:incompatible"],
20+
"@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32": ["@platforms//:incompatible"],
2221
"//conditions:default": [],
2322
}),
2423
visibility = ["@bzlmodrio-ni//:__subpackages__"],

‎private/cpp/visa/BUILD.bazel‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ cc_library(
2222
"@bazel_tools//src/conditions:darwin": ["@platforms//:incompatible"],
2323
"@bazel_tools//src/conditions:linux_x86_64": ["@platforms//:incompatible"],
2424
"@bazel_tools//src/conditions:windows": ["@platforms//:incompatible"],
25-
"@rules_bzlmodrio_toolchains//constraints/is_bullseye32:bullseye32": ["@platforms//:incompatible"],
26-
"@rules_bzlmodrio_toolchains//constraints/is_bullseye64:bullseye64": ["@platforms//:incompatible"],
27-
"@rules_bzlmodrio_toolchains//constraints/is_raspi32:raspi32": ["@platforms//:incompatible"],
25+
"@rules_bzlmodrio_toolchains//constraints/is_bookworm64:bookworm64": ["@platforms//:incompatible"],
26+
"@rules_bzlmodrio_toolchains//constraints/is_raspibookworm32:raspibookworm32": ["@platforms//:incompatible"],
2827
"//conditions:default": [],
2928
}),
3029
visibility = ["@bzlmodrio-ni//:__subpackages__"],

0 commit comments

Comments
 (0)