Skip to content

Commit a370d3a

Browse files
committed
Try again
1 parent 9b30a6b commit a370d3a

4 files changed

Lines changed: 18 additions & 61 deletions

File tree

.github/workflows/build.yml

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -84,42 +84,6 @@ jobs:
8484
run: bazel ${{ matrix.bazel_options }} ${{ matrix.command }} //... -k ${{ matrix.config }} --verbose_failures --config=ci
8585
working-directory: tests
8686

87-
build_linuxarm32:
88-
strategy:
89-
fail-fast: false
90-
matrix:
91-
include:
92-
# Build non-bzlmod, linuxarm32
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: "", }
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-24.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: "", }
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-
12387
build_linuxarm64:
12488
strategy:
12589
fail-fast: false

WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ http_archive(
4040

4141
http_archive(
4242
name = "rules_bzlmodrio_toolchains",
43-
sha256 = "b86f16f282a767bf73a341efcbd955613e4a20aa6f1fe7f229583af68e51acf8",
44-
url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1.bcr5/rules_bzlmodRio_toolchains-2025-1.bcr5.tar.gz",
43+
sha256 = "fcd712645a4c3c9c6e194f6ac3c240f0a67f4832b02acef524382732cf89ae60",
44+
url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1.bcr7/rules_bzlmodRio_toolchains-2025-1.bcr7.tar.gz",
4545
)
4646

4747
########################

private/non_bzlmod_dependencies/setup_dependencies.bzl

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,12 @@ def _setup_toolchains():
99
load_toolchains()
1010

1111
native.register_toolchains(
12-
"@local_roborio//:macos",
13-
"@local_roborio//:linux",
14-
"@local_roborio//:windows",
1512
"@local_systemcore//:macos",
1613
"@local_systemcore//:linux",
1714
"@local_systemcore//:windows",
18-
"@local_raspi_bullseye_32//:macos",
19-
"@local_raspi_bullseye_32//:linux",
20-
"@local_raspi_bullseye_32//:windows",
21-
"@local_raspi_bookworm_32//:macos",
22-
"@local_raspi_bookworm_32//:linux",
23-
"@local_raspi_bookworm_32//:windows",
24-
"@local_bullseye_32//:macos",
25-
"@local_bullseye_32//:linux",
26-
"@local_bullseye_32//:windows",
27-
"@local_bullseye_64//:macos",
28-
"@local_bullseye_64//:linux",
29-
"@local_bullseye_64//:windows",
30-
"@local_bookworm_32//:macos",
31-
"@local_bookworm_32//:linux",
32-
"@local_bookworm_32//:windows",
33-
"@local_bookworm_64//:macos",
34-
"@local_bookworm_64//:linux",
35-
"@local_bookworm_64//:windows",
15+
"@local_bookworm64//:macos",
16+
"@local_bookworm64//:linux",
17+
"@local_bookworm64//:windows",
3618
)
3719

3820
def _setup_cpp_dependencies():

tests/WORKSPACE

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ http_archive(
1616
url = "https://github.com/bazelbuild/rules_cc/releases/download/0.1.4/rules_cc-0.1.4.tar.gz",
1717
)
1818

19+
http_archive(
20+
name = "bazel_features",
21+
sha256 = "a015f3f2ebf4f1ac3f4ca8ea371610acb63e1903514fa8725272d381948d2747",
22+
strip_prefix = "bazel_features-1.31.0",
23+
url = "https://github.com/bazel-contrib/bazel_features/releases/download/v1.31.0/bazel_features-v1.31.0.tar.gz",
24+
)
25+
1926
http_archive(
2027
name = "rules_java",
2128
sha256 = "1558508fc6c348d7f99477bd21681e5746936f15f0436b5f4233e30832a590f9",
@@ -37,8 +44,8 @@ http_archive(
3744

3845
http_archive(
3946
name = "rules_bzlmodrio_toolchains",
40-
sha256 = "b86f16f282a767bf73a341efcbd955613e4a20aa6f1fe7f229583af68e51acf8",
41-
url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1.bcr5/rules_bzlmodRio_toolchains-2025-1.bcr5.tar.gz",
47+
sha256 = "fcd712645a4c3c9c6e194f6ac3c240f0a67f4832b02acef524382732cf89ae60",
48+
url = "https://github.com/wpilibsuite/rules_bzlmodRio_toolchains/releases/download/2025-1.bcr7/rules_bzlmodRio_toolchains-2025-1.bcr7.tar.gz",
4249
)
4350

4451
http_archive(
@@ -79,6 +86,10 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
7986

8087
protobuf_deps()
8188

89+
load("@bazel_features//:deps.bzl", "bazel_features_deps")
90+
91+
bazel_features_deps()
92+
8293
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
8394

8495
rules_java_dependencies()

0 commit comments

Comments
 (0)