Merging latest master into feature/p-token#1022
Merged
automergerpr-permission-manager[bot] merged 5 commits intofeature/p-tokenfrom Apr 8, 2026
Merged
Merging latest master into feature/p-token#1022automergerpr-permission-manager[bot] merged 5 commits intofeature/p-tokenfrom
automergerpr-permission-manager[bot] merged 5 commits intofeature/p-tokenfrom
Conversation
## Summary - make the manual `test-stable-mir-ui` workflow runnable on the self-hosted runner - derive the Rust toolchain from repo-tracked `rust-toolchain.toml` instead of hardcoding it in the workflow - derive the `rust-lang/rust` checkout commit from the active toolchain's `rustc -vV` output instead of maintaining a separate fixed Rust source pin - upload the real failure outputs from inside the Docker container, including updated `skip.txt` when requested ## Context - Stacked on #968 / `codex/import-stable-mir-ui-tests` - The base PR adds the workflow; this PR makes that workflow usable end-to-end in the containerized setup while keeping both the installed toolchain and the checked-out Rust source tree aligned to the same nightly ## Testing - Manual validation on `zhaoji`: rebuilt the workflow image after deriving `RUST_TOOLCHAIN=nightly-2024-11-29` from `rust-toolchain.toml` - Manual validation on `zhaoji`: verified `make stable-mir-json` succeeds before the UI run - Manual validation on `zhaoji`: verified `test-filter='foo or bar'` is passed through correctly - Manual validation on `zhaoji`: verified proof artifacts and updated `skip.txt` are copied back from the container - Local container validation: verified `rustc -vV` in the workflow image resolves `commit-hash: a2545fd6fc66b4323f555223a860c451885d1d2b` for `nightly-2024-11-29`, and the workflow's shallow `rust-lang/rust` checkout can `fetch` and `checkout` that commit successfully - Local container validation: verified `make stable-mir-json` and `make build` succeed after aligning the Rust checkout from the active toolchain - Local container validation: ran a single-case smoke path (`tests/ui/issues/issue-11205.rs`) through `RUST_DIR_ROOT=rust make test-stable-mir-ui`; workflow plumbing succeeded and the test reached the proof stage, while the proof itself still failed with `AssertionError: Proof did not pass`
Our PRs currently mostly fail CI due to the `Haskell Exec SMIR` CI test timing out. I increased it from 20 to 30 minutes.
The timeout increase [here](#1021) is not enough (depending on the state of the GH runners, this is still a bit too tight). I measured locally, and it took around 40 minutes, so I added another 10 as a leeway for a total of 50 min.
automergerpr-permission-manager
Bot
merged commit 4aa9a35
into
feature/p-token
21 of 22 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.