Skip to content

Commit 3eca977

Browse files
pjreinigerpjreiniger
authored
Update toolchains to reflect gradlerio naming (#20)
* Update toolchains to reflect gradlerio naming * Fixup
1 parent 1c83ed7 commit 3eca977

File tree

17 files changed

+395
-214
lines changed

17 files changed

+395
-214
lines changed

‎.bazelrc‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,29 @@ build:bullseye64 --platform_suffix=bullseye64
2525

2626
# bookworm32
2727
build:bookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm32
28-
build:bookworm32 --build_tag_filters=-no-bullseye
28+
build:bookworm32 --build_tag_filters=-no-bookworm
2929
build:bookworm32 --platform_suffix=bookworm32
3030

3131
# bookworm64
3232
build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
33-
build:bookworm64 --build_tag_filters=-no-bullseye
33+
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‎

Lines changed: 9 additions & 4 deletions
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‎

Lines changed: 21 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
- { name: "macos - roborio", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=roborio", bazel_options: "", }
6060

6161
# Build bzlmod, roborio
62-
# - { name: "windows - bzlmod roborio", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
62+
# - { name: "windows - bzlmod roborio", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=roborio", bazel_options: "--output_user_root=C:\\bazelroot", }
6363
- { name: "ubuntu - bzlmod roborio", os: ubuntu-22.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 }}"
@@ -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: "", }
96-
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: "", }
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: "", }
96+
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:
@@ -157,20 +120,20 @@ jobs:
157120
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
158121
working-directory: tests
159122

160-
build_bookworm32:
123+
build_linuxarm64:
161124
strategy:
162125
fail-fast: false
163126
matrix:
164127
include:
165-
# Build non-bzlmod, bookworm32
166-
- { name: "windows - bookworm32", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bookworm32", bazel_options: "--output_user_root=C:\\bazelroot", }
167-
- { name: "ubuntu - bookworm32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bookworm32", bazel_options: "", }
168-
- { name: "macos - bookworm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bookworm32", bazel_options: "", }
169-
170-
# Build bzlmod, bookworm32
171-
- { name: "windows - bzlmod bookworm32", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bookworm32", bazel_options: "--output_user_root=C:\\bazelroot", }
172-
- { name: "ubuntu - bzlmod bookworm32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bookworm32", bazel_options: "", }
173-
- { name: "macos - bzlmod bookworm32", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bookworm32", bazel_options: "", }
128+
# 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: "", }
132+
133+
# Build bzlmod, linuxarm64
134+
- { 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: "", }
136+
- { name: "macos - bzlmod linuxarm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=linuxarm64", bazel_options: "", }
174137
name: "Build - ${{ matrix.name }}"
175138
runs-on: ${{ matrix.os }}
176139
steps:
@@ -192,63 +155,3 @@ jobs:
192155
- name: Build
193156
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
194157
working-directory: tests
195-
196-
197-
build_bookworm64:
198-
strategy:
199-
fail-fast: false
200-
matrix:
201-
include:
202-
# Build non-bzlmod, bookworm64:
203-
- { name: "windows - bookworm64", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bookworm64", bazel_options: "--output_user_root=C:\\bazelroot", }
204-
- { name: "ubuntu - bookworm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=bookworm64", bazel_options: "", }
205-
- { name: "macos - bookworm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=bookworm64", bazel_options: "", }
206-
207-
# Build bzlmod, bookworm64:
208-
- { name: "windows - bzlmod bookworm64", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bookworm64", bazel_options: "--output_user_root=C:\\bazelroot", }
209-
- { name: "ubuntu - bzlmod bookworm64", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=bookworm64", bazel_options: "", }
210-
- { name: "macos - bzlmod bookworm64", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=bookworm64", bazel_options: "", }
211-
name: "Build - ${{ matrix.name }}"
212-
runs-on: ${{ matrix.os }}
213-
steps:
214-
- uses: actions/checkout@v4
215-
- uses: actions/setup-python@v5
216-
with: { python-version: '3.11' }
217-
- uses: actions/setup-java@v4
218-
with:
219-
distribution: 'zulu'
220-
java-version: 17
221-
architecture: ${{ matrix.java_arch }}
222-
- id: setup_build_buddy
223-
uses: ./.github/actions/setup-build-buddy
224-
with:
225-
token: ${{ secrets.BUILDBUDDY_API_KEY }}
226-
- name: Build and allow failure # TODO Sometimes symlinks don't get created correctly the first time around
227-
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci || true
228-
working-directory: tests
229-
- name: Build
230-
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
231-
working-directory: tests
232-
233-
234-
235-
build_raspi32:
236-
strategy:
237-
fail-fast: false
238-
matrix:
239-
include:
240-
# Build non-bzlmod, raspi32:
241-
- { name: "windows - raspi32", os: windows-2022, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=raspi32", bazel_options: "--output_user_root=C:\\bazelroot", }
242-
- { name: "ubuntu - raspi32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--noenable_bzlmod --config=raspi32", bazel_options: "", }
243-
- { name: "macos - raspi32", os: macos-14, java_arch: "aarch64", command: "build", config: "--noenable_bzlmod --config=raspi32", bazel_options: "", }
244-
245-
# Build bzlmod, raspi32:
246-
- { name: "windows - bzlmod raspi32", os: windows-2022, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=raspi32", bazel_options: "--output_user_root=C:\\bazelroot", }
247-
- { name: "ubuntu - bzlmod raspi32", os: ubuntu-22.04, java_arch: "x64", command: "build", config: "--enable_bzlmod --config=raspi32", bazel_options: "", }
248-
- { name: "macos - bzlmod raspi32", os: macos-14, java_arch: "aarch64", command: "build", config: "--enable_bzlmod --config=raspi32", bazel_options: "", }
249-
name: "Build - ${{ matrix.name }}"
250-
runs-on: ${{ matrix.os }}
251-
steps:
252-
- uses: actions/checkout@v4
253-
- run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
254-
working-directory: tests

‎MODULE.bazel‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module(
22
name = "rules_bzlmodrio_toolchains",
3-
version = "2025-1",
3+
version = "2025-1.bcr1",
44
compatibility_level = 2025,
55
)
66

@@ -13,26 +13,36 @@ use_repo(
1313
deps,
1414
"bazelrio_bookworm_32_toolchain_linux",
1515
"bazelrio_bookworm_32_toolchain_macos",
16+
"bazelrio_bookworm_32_toolchain_macosarm",
1617
"bazelrio_bookworm_32_toolchain_windows",
1718
"bazelrio_bookworm_64_toolchain_linux",
1819
"bazelrio_bookworm_64_toolchain_macos",
20+
"bazelrio_bookworm_64_toolchain_macosarm",
1921
"bazelrio_bookworm_64_toolchain_windows",
2022
"bazelrio_bullseye_32_toolchain_linux",
2123
"bazelrio_bullseye_32_toolchain_macos",
24+
"bazelrio_bullseye_32_toolchain_macosarm",
2225
"bazelrio_bullseye_32_toolchain_windows",
2326
"bazelrio_bullseye_64_toolchain_linux",
2427
"bazelrio_bullseye_64_toolchain_macos",
28+
"bazelrio_bullseye_64_toolchain_macosarm",
2529
"bazelrio_bullseye_64_toolchain_windows",
26-
"bazelrio_raspi_32_toolchain_linux",
27-
"bazelrio_raspi_32_toolchain_macos",
28-
"bazelrio_raspi_32_toolchain_windows",
30+
"bazelrio_raspi_bookworm_32_toolchain_linux",
31+
"bazelrio_raspi_bookworm_32_toolchain_macos",
32+
"bazelrio_raspi_bookworm_32_toolchain_macosarm",
33+
"bazelrio_raspi_bookworm_32_toolchain_windows",
34+
"bazelrio_raspi_bullseye_32_toolchain_linux",
35+
"bazelrio_raspi_bullseye_32_toolchain_macos",
36+
"bazelrio_raspi_bullseye_32_toolchain_macosarm",
37+
"bazelrio_raspi_bullseye_32_toolchain_windows",
2938
"bazelrio_roborio_toolchain_linux",
3039
"bazelrio_roborio_toolchain_macos",
40+
"bazelrio_roborio_toolchain_macosarm",
3141
"bazelrio_roborio_toolchain_windows",
3242
)
3343

3444
sh_configure = use_extension("@rules_bzlmodrio_toolchains//:extensions.bzl", "sh_configure")
35-
use_repo(sh_configure, "local_bookworm_32", "local_bookworm_64", "local_bullseye_32", "local_bullseye_64", "local_raspi_32", "local_roborio")
45+
use_repo(sh_configure, "local_bookworm_32", "local_bookworm_64", "local_bullseye_32", "local_bullseye_64", "local_raspi_bookworm_32", "local_raspi_bullseye_32", "local_roborio")
3646

3747
register_toolchains(
3848
"@local_bookworm_32//:macos",
@@ -47,9 +57,12 @@ register_toolchains(
4757
"@local_bullseye_64//:macos",
4858
"@local_bullseye_64//:linux",
4959
"@local_bullseye_64//:windows",
50-
"@local_raspi_32//:macos",
51-
"@local_raspi_32//:linux",
52-
"@local_raspi_32//:windows",
60+
"@local_raspi_bookworm_32//:macos",
61+
"@local_raspi_bookworm_32//:linux",
62+
"@local_raspi_bookworm_32//:windows",
63+
"@local_raspi_bullseye_32//:macos",
64+
"@local_raspi_bullseye_32//:linux",
65+
"@local_raspi_bullseye_32//:windows",
5366
"@local_roborio//:macos",
5467
"@local_roborio//:linux",
5568
"@local_roborio//:windows",

‎WORKSPACE‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ register_toolchains(
2121
"@local_bullseye_64//:macos",
2222
"@local_bullseye_64//:linux",
2323
"@local_bullseye_64//:windows",
24-
"@local_raspi_32//:macos",
25-
"@local_raspi_32//:linux",
26-
"@local_raspi_32//:windows",
24+
"@local_raspi_bookworm_32//:macos",
25+
"@local_raspi_bookworm_32//:linux",
26+
"@local_raspi_bookworm_32//:windows",
27+
"@local_raspi_bullseye_32//:macos",
28+
"@local_raspi_bullseye_32//:linux",
29+
"@local_raspi_bullseye_32//:windows",
2730
"@local_roborio//:macos",
2831
"@local_roborio//:linux",
2932
"@local_roborio//:windows",

‎constraints/combined/BUILD.bazel‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ selects.config_setting_group(
66
"//constraints/is_roborio:roborio",
77
"//constraints/is_bullseye32:bullseye32",
88
"//constraints/is_bullseye64:bullseye64",
9-
"//constraints/is_raspi32:raspi32",
9+
"//constraints/is_bookworm32:bookworm32",
10+
"//constraints/is_bookworm64:bookworm64",
11+
"//constraints/is_raspibullseye32:raspibullseye32",
12+
"//constraints/is_raspibookworm32:raspibookworm32",
1013
],
1114
)
1215

0 commit comments

Comments
 (0)