Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Pin miri to the version that does not fail (#64013)

Kirill Bulatov26b6a267b040
diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml
index bf7b83a7bff..ba346ffee3e 100644
--- a/.github/workflows/run_tests.yml
+++ b/.github/workflows/run_tests.yml
@@ -505,9 +505,11 @@ jobs:
cache: rust
path: ~/.rustup
- name: run_tests::miri_scheduler::install_miri
- run: rustup toolchain install nightly --profile minimal --component miri --component rust-src
+ run: rustup toolchain install nightly-2026-09-09 --profile minimal --component miri --component rust-src
+ - name: run_tests::miri_scheduler::clean_miri
+ run: cargo +nightly-2026-09-09 miri clean
- name: run_tests::miri_scheduler::run_scheduler_tests_under_miri
- run: cargo +nightly -q miri test -p scheduler
+ run: cargo +nightly-2026-09-09 -q miri test -p scheduler
- name: steps::cleanup_cargo_config
if: always()
run: |
diff --git a/tooling/xtask/src/tasks/workflows/run_tests.rs b/tooling/xtask/src/tasks/workflows/run_tests.rs
index 68470fe7998..a4463cf5ee2 100644
--- a/tooling/xtask/src/tasks/workflows/run_tests.rs
+++ b/tooling/xtask/src/tasks/workflows/run_tests.rs
@@ -730,13 +730,19 @@ pub(crate) fn check_postgres_and_protobuf_migrations() -> NamedJob {
fn miri_scheduler() -> NamedJob {
fn install_miri() -> Step<Run> {
+ // TODO: Unpin Miri after updating parking_lot_core to fix its futex argument types.
+ // Nightly 2026-09-10 added stricter checks in rust-lang/rust#161734.
named::bash(
- "rustup toolchain install nightly --profile minimal --component miri --component rust-src",
+ "rustup toolchain install nightly-2026-09-09 --profile minimal --component miri --component rust-src",
)
}
+ fn clean_miri() -> Step<Run> {
+ named::bash("cargo +nightly-2026-09-09 miri clean")
+ }
+
fn run_scheduler_tests_under_miri() -> Step<Run> {
- named::bash("cargo +nightly -q miri test -p scheduler")
+ named::bash("cargo +nightly-2026-09-09 -q miri test -p scheduler")
}
named::job(
@@ -747,6 +753,7 @@ fn miri_scheduler() -> NamedJob {
.add_step(steps::setup_cargo_config(Platform::Linux))
.add_step(steps::cache_rust_dependencies_namespace())
.add_step(install_miri())
+ .add_step(clean_miri())
.add_step(run_scheduler_tests_under_miri())
.add_step(steps::cleanup_cargo_config(Platform::Linux)),
)