Skip to content

Commit fb94150

Browse files
jprendesCopilot
andcommitted
Run Miri once everywhere it ran, not only on pull requests
The nightly musl matrix ran Miri in all eight of its entries, on the same pools the pull request matrix was freed from. Its `TARGET_TRIPLE` never reaches the recipe, which builds for the host with plain cargo, and the toolchain it pins is the same one every other job uses, so the eight runs covered what one does. The aarch64 daily run waited on the guest builds before starting. Miri reads no guest binary, so it now waits for nothing and reports even when they fail. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Signed-off-by: Jorge Prendes <jorge.prendes@gmail.com>
1 parent a7897be commit fb94150

2 files changed

Lines changed: 13 additions & 12 deletions

File tree

‎.github/workflows/DailyArm64.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,10 @@ jobs:
3737
arch: arm64
3838
config: ${{ matrix.config }}
3939

40-
# Miri on aarch64, which the build-and-test matrix no longer carries.
40+
# Miri on aarch64, which the build-and-test matrix no longer carries. It
41+
# reads no guest binaries, so it waits for nothing and reports even when the
42+
# guests fail to build.
4143
miri:
42-
needs: build-guests
4344
uses: ./.github/workflows/dep_miri.yml
4445
secrets: inherit
4546
with:

‎.github/workflows/RustNightly.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,6 @@ jobs:
9898
- name: Build
9999
run: just build ${{ matrix.config }}
100100

101-
- name: Install cargo-nextest
102-
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
103-
with:
104-
tool: cargo-nextest
105-
106-
- name: Run Miri tests
107-
run: env -u RUSTC_WRAPPER just miri-tests
108-
109101
- name: Run Rust tests
110102
run: |
111103
# with default features
@@ -140,10 +132,18 @@ jobs:
140132
RUST_LOG: debug
141133
run: just test-rust-tracing ${{ matrix.config }}
142134

135+
# Miri asks nothing of a runner beyond its architecture, so it runs once on a
136+
# hosted one rather than in every entry of the musl matrix.
137+
miri:
138+
uses: ./.github/workflows/dep_miri.yml
139+
secrets: inherit
140+
with:
141+
arch: X64
142+
143143
notify-failure:
144144
runs-on: ubuntu-latest
145-
needs: musl
146-
if: always() && needs.musl.result == 'failure'
145+
needs: [musl, miri]
146+
if: always() && (needs.musl.result == 'failure' || needs.miri.result == 'failure')
147147
permissions:
148148
issues: write
149149
steps:

0 commit comments

Comments
 (0)