Skip to content

Commit 13168fb

Browse files
committed
Fixup workspace
1 parent 37062c2 commit 13168fb

5 files changed

Lines changed: 94 additions & 153 deletions

File tree

.bazelrc

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,6 @@ build:systemcore --platforms=@rules_bzlmodrio_toolchains//platforms/systemcore
1818
build:systemcore --build_tag_filters=-no-systemcore
1919
build:systemcore --platform_suffix=systemcore
2020

21-
# bullseye32
22-
build:bullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye32
23-
build:bullseye32 --build_tag_filters=-no-bullseye32
24-
build:bullseye32 --platform_suffix=bullseye32
25-
26-
# bullseye64
27-
build:bullseye64 --platforms=@rules_bzlmodrio_toolchains//platforms/bullseye64
28-
build:bullseye64 --build_tag_filters=-no-bullseye64
29-
build:bullseye64 --platform_suffix=bullseye64
30-
3121
# bookworm32
3222
build:bookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm32
3323
build:bookworm32 --build_tag_filters=-no-bookworm32
@@ -38,19 +28,14 @@ build:bookworm64 --platforms=@rules_bzlmodrio_toolchains//platforms/bookworm64
3828
build:bookworm64 --build_tag_filters=-no-bookworm64
3929
build:bookworm64 --platform_suffix=bookworm64
4030

41-
# raspibullseye32
42-
build:raspibullseye32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibullseye32
43-
build:raspibullseye32 --build_tag_filters=-no-raspibullseye32
44-
build:raspibullseye32 --platform_suffix=raspibullseye32
45-
46-
# raspibookworm32
47-
build:raspibookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/raspibookworm32
48-
build:raspibookworm32 --build_tag_filters=-no-raspibookworm32
49-
build:raspibookworm32 --platform_suffix=raspibookworm32
31+
# rpbookworm32
32+
build:rpbookworm32 --platforms=@rules_bzlmodrio_toolchains//platforms/rpbookworm32
33+
build:rpbookworm32 --build_tag_filters=-no-rpbookworm32
34+
build:rpbookworm32 --platform_suffix=rpbookworm32
5035

5136
# Alias toolchain names to what wpilibsuite uses for CI/Artifact naming
5237
build:athena --config=roborio
53-
build:linuxarm32 --config=raspibookworm32
38+
build:linuxarm32 --config=rpbookworm32
5439
build:linuxarm64 --config=bookworm64
5540

5641
test --test_output=errors

.github/workflows/lint.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
name: "buildifier"
1313
runs-on: ubuntu-22.04
1414
steps:
15-
- name: Set up Go 1.20.x
16-
uses: actions/setup-go@v5
15+
- name: Set up Go
16+
uses: actions/setup-go@v6
1717
with:
18-
go-version: 1.20.x
18+
go-version: "1.25"
1919
cache: false
2020
id: go
2121

tests/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ bazel_dep(name = "rules_cc", version = "0.1.4")
99
bazel_dep(name = "rules_java", version = "8.11.0")
1010
bazel_dep(name = "rules_jvm_external", version = "6.3")
1111
bazel_dep(name = "rules_bazelrio", version = "0.0.14")
12-
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr5")
12+
bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2025-1.bcr7")
1313
bazel_dep(name = "rules_bzlmodrio_jdk", version = "17.0.12-7.bcr1")
1414

1515
# TODO replace with released version once they make one that has Austins patch

0 commit comments

Comments
 (0)