Skip to content

Commit a3fbd61

Browse files
committed
Added CI for nightly toolchains
1 parent 3c484f1 commit a3fbd61

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

.bazelci/presubmit.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
aspects_flags: &aspects_flags
33
- "--config=rustfmt"
44
- "--config=clippy"
5+
nightly_aspects_flags: &nightly_aspects_flags
6+
- "--//rust/toolchain/channel=nightly"
7+
- "--config=rustfmt"
8+
- "--config=clippy"
9+
nightly_flags: &nightly_flags
10+
- "--//rust/toolchain/channel=nightly"
11+
nightly_targets: &nightly_targets
12+
- "--"
13+
- "//..."
14+
# There will not be a stable toolchain registered so this test will expectedly fail.
15+
- "-//test/unit/channel_transitions/..."
516
default_linux_targets: &default_linux_targets
617
- "//..."
718
default_macos_targets: &default_macos_targets
@@ -202,6 +213,24 @@ tasks:
202213
build_targets: *default_linux_targets
203214
test_targets: *default_linux_targets
204215
build_flags: *aspects_flags
216+
ubuntu2004_nightly_toolchain:
217+
name: "Nightly Toolchain"
218+
platform: ubuntu2004
219+
# Test rules while only registering a nightly toolchain
220+
shell_commands:
221+
- sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_NIGHTLY_ISO_DATE")\nrust_register_toolchains(versions = ["nightly/" + DEFAULT_NIGHTLY_ISO_DATE],\n|' WORKSPACE.bazel
222+
build_flags: *nightly_flags
223+
build_targets: *nightly_targets
224+
test_targets: *nightly_targets
225+
ubuntu2004_nightly_with_aspects:
226+
name: "Nightly Toolchain With Aspects"
227+
platform: ubuntu2004
228+
# Test rules while only registering a nightly toolchain
229+
shell_commands:
230+
- sed -i 's|^rust_register_toolchains(|load("//rust/private:common.bzl", "DEFAULT_NIGHTLY_ISO_DATE")\nrust_register_toolchains(versions = ["nightly/" + DEFAULT_NIGHTLY_ISO_DATE],\n|' WORKSPACE.bazel
231+
build_flags: *nightly_aspects_flags
232+
build_targets: *nightly_targets
233+
test_targets: *nightly_targets
205234
ubuntu2004_rolling_with_aspects:
206235
name: "Rolling Bazel Version With Aspects"
207236
bazel: "rolling"

examples/zig_cross_compiling/WORKSPACE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ rust_version = "1.65.0"
3535
rust_register_toolchains(
3636
edition = "2021",
3737
extra_target_triples = [],
38-
version = rust_version,
38+
versions = [rust_version],
3939
)
4040

4141
rust_repository_set(

0 commit comments

Comments
 (0)