Skip to content

Commit c05d1a9

Browse files
pjreinigerpjreiniger
committed
2026 updates
1 parent 0feea1e commit c05d1a9

23 files changed

+775
-1824
lines changed

‎.bazelrc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import .bazelrc-cc
55
import .bazelrc-java
66
import .bazelrc-buildbuddy
77

8-
build --incompatible_disallow_empty_glob=1 # Bazel 8 prep
9-
108
build --test_env=LD_LIBRARY_PATH=.
119
build --test_env=DYLD_LIBRARY_PATH=.
1210

‎.bazelrc-buildbuddy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ build:build_buddy --remote_cache=grpcs://remote.buildbuddy.io
77
build:build_buddy --remote_timeout=3600
88

99
# Additional suggestions from buildbuddy for speed
10-
build:build_buddy --experimental_remote_cache_compression
10+
build:build_buddy --remote_cache_compression
1111
build:build_buddy --experimental_remote_cache_compression_threshold=100
1212
build:build_buddy --noslim_profile
1313
build:build_buddy --experimental_profile_include_target_label

‎.bazelrc-cc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ build:windows_arm --cxxopt=/wd4146
1919
build:windows_arm --cxxopt=/wd4267
2020
build:windows_arm --cxxopt=/wd4244
2121
build:windows_arm --cxxopt=/utf-8
22-
build:windows_arm --cpu=arm64_windows
22+
build:windows_arm --platforms="@rules_bzlmodrio_toolchains//platforms/windows_arm64"
23+
build:windows_arm --platform_suffix=windowsarm64
2324

2425
# Linux
2526
build:linux --copt=-Wall

‎.bazelversion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.3.1
1+
8.3.1

‎.github/workflows/build.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
matrix:
1313
include:
1414
# Build non-bzlmod, native
15-
- { name: "windows - native", os: windows-2022, java_arch: "x64", command: "test", config: "--noenable_bzlmod --config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
16-
- { name: "windows arm - native", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
17-
- { name: "ubuntu - native", os: ubuntu-22.04, java_arch: "x64", command: "test", config: "--noenable_bzlmod --config=linux", bazel_options: "", }
18-
- { name: "macos - native", os: macos-14, java_arch: "aarch64", command: "test", config: "--noenable_bzlmod --config=macos", bazel_options: "", }
15+
- { name: "windows - native", os: windows-2022, java_arch: "x64", command: "test", config: "--noenable_bzlmod --enable_workspace --config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
16+
- { name: "windows arm - native", os: windows-11-arm, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
17+
- { name: "ubuntu - native", os: ubuntu-24.04, java_arch: "x64", command: "test", config: "--noenable_bzlmod --enable_workspace --config=linux", bazel_options: "", }
18+
- { name: "macos - native", os: macos-14, java_arch: "aarch64", command: "test", config: "--noenable_bzlmod --enable_workspace --config=macos", bazel_options: "", }
1919

2020
# Build bzlmod, native
2121
- { name: "windows - bzlmod native", os: windows-2022, java_arch: "x64", command: "test", config: "--enable_bzlmod --config=windows", bazel_options: "--output_user_root=C:\\bazelroot", }
22-
- { name: "windows arm - bzlmod native", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
23-
- { name: "ubuntu - bzlmod native", os: ubuntu-22.04, java_arch: "x64", command: "test", config: "--enable_bzlmod --config=linux", bazel_options: "", }
22+
- { name: "windows arm - bzlmod native", os: windows-11-arm, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=windows_arm", bazel_options: "--output_user_root=C:\\bazelroot", }
23+
- { name: "ubuntu - bzlmod native", os: ubuntu-24.04, java_arch: "x64", command: "test", config: "--enable_bzlmod --config=linux", bazel_options: "", }
2424
- { name: "macos - bzlmod native", os: macos-14, java_arch: "aarch64", command: "test", config: "--enable_bzlmod --config=macos", bazel_options: "", }
2525

2626
name: "Build - ${{ matrix.name }}"
@@ -54,13 +54,13 @@ jobs:
5454
matrix:
5555
include:
5656
# Build non-bzlmod, roborio
57-
- { name: "windows - roborio", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
58-
- { name: "ubuntu - roborio", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "", }
59-
- { name: "macos - roborio", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "", }
57+
- { name: "windows - roborio", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
58+
- { name: "ubuntu - roborio", os: ubuntu-24.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=roborio", bazel_options: "", }
59+
- { name: "macos - roborio", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=roborio", bazel_options: "", }
6060

6161
# Build bzlmod, roborio
6262
# - { name: "windows - bzlmod roborio", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
63-
- { name: "ubuntu - bzlmod roborio", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "", }
63+
- { name: "ubuntu - bzlmod roborio", os: ubuntu-24.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "", }
6464
- { name: "macos - bzlmod roborio", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "", }
6565
name: "Build - ${{ matrix.name }}"
6666
runs-on: ${{ matrix.os }}
@@ -90,13 +90,13 @@ jobs:
9090
matrix:
9191
include:
9292
# 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: "", }
93+
- { name: "windows - linuxarm32", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm32", bazel_options: "--output_user_root=C:\\bazelroot", }
94+
- { name: "ubuntu - linuxarm32", os: ubuntu-24.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm32", bazel_options: "", }
95+
- { name: "macos - linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm32", bazel_options: "", }
9696

9797
# Build bzlmod, linuxarm32
9898
# - { 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: "", }
99+
- { name: "ubuntu - bzlmod linuxarm32", os: ubuntu-24.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "", }
100100
- { name: "macos - bzlmod linuxarm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=linuxarm32", bazel_options: "", }
101101
name: "Build - ${{ matrix.name }}"
102102
runs-on: ${{ matrix.os }}
@@ -126,13 +126,13 @@ jobs:
126126
matrix:
127127
include:
128128
# Build non-bzlmod, linuxarm64
129-
- { name: "windows - linuxarm64", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm64", bazel_options: "--output_user_root=C:\\bazelroot", }
130-
- { name: "ubuntu - linuxarm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=linuxarm64", bazel_options: "", }
131-
- { name: "macos - linuxarm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=linuxarm64", bazel_options: "", }
129+
- { name: "windows - linuxarm64", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm64", bazel_options: "--output_user_root=C:\\bazelroot", }
130+
- { name: "ubuntu - linuxarm64", os: ubuntu-24.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm64", bazel_options: "", }
131+
- { name: "macos - linuxarm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --enable_workspace --config=linuxarm64", bazel_options: "", }
132132

133133
# Build bzlmod, linuxarm64
134134
- { name: "windows - bzlmod linuxarm64", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "--output_user_root=C:\\bazelroot", }
135-
- { name: "ubuntu - bzlmod linuxarm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "", }
135+
- { name: "ubuntu - bzlmod linuxarm64", os: ubuntu-24.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "", }
136136
- { name: "macos - bzlmod linuxarm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "", }
137137
name: "Build - ${{ matrix.name }}"
138138
runs-on: ${{ matrix.os }}

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
sudo sh -c "echo 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-14 main' >> /etc/apt/sources.list.d/proposed-repositories.list"
2828
sudo apt-get update -q
2929
sudo apt-get install -y clang-format-14
30-
- run: bazel run --noenable_bzlmod @rules_wpiformat//wpiformat -- -f ..
30+
- run: bazel run --noenable_bzlmod --enable_workspace @rules_wpiformat//wpiformat -- -f ..
3131
working-directory: tests
3232
if: github.ref != 'refs/heads/main'
3333

‎.github/workflows/publish.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,15 @@ jobs:
2626
- name: Setup archive name
2727
run: echo "ARCHIVE_NAME=libraries/bzlmodrio-ni/bzlmodrio-ni-${GITHUB_REF_NAME}.tar.gz" >> "$GITHUB_ENV"
2828

29+
- name: Pre Release
30+
uses: softprops/action-gh-release@v2
31+
if: startsWith(github.ref, 'refs/tags/') && (contains(github.ref, 'alpha') || contains(github.ref, 'beta'))
32+
with:
33+
files: "${{ env.ARCHIVE_NAME }}"
34+
prerelease: True
35+
2936
- name: Release
3037
uses: softprops/action-gh-release@v2
31-
if: startsWith(github.ref, 'refs/tags/')
38+
if: startsWith(github.ref, 'refs/tags/') && !(contains(github.ref, 'alpha') || contains(github.ref, 'beta'))
3239
with:
3340
files: "${{ env.ARCHIVE_NAME }}"

‎.styleguide-license‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-

‎MODULE.bazel‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module(
22
name = "bzlmodrio-ni",
3-
version = "2025.2.0.bcr1",
4-
compatibility_level = 2025,
3+
version = "2026.1.0",
4+
compatibility_level = 2026,
55
)
66

7-
bazel_dep(name = "platforms", version = "0.0.9")
8-
bazel_dep(name = "rules_cc", version = "0.0.9")
9-
bazel_dep(name = "rules_java", version = "7.6.5")
10-
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr2")
7+
bazel_dep(name = "platforms", version = "0.0.11")
8+
bazel_dep(name = "rules_cc", version = "0.1.4")
9+
bazel_dep(name = "rules_java", version = "8.12.0")
10+
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr5")
1111

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

0 commit comments

Comments
 (0)