Skip to content

Commit 94b27e9

Browse files
committed
Auto merge of #124754 - RalfJung:miri-sync, r=RalfJung
Miri subtree update r? `@ghost`
2 parents 77ab64d + 55306af commit 94b27e9

File tree

120 files changed

+1828
-1622
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+1828
-1622
lines changed

.github/workflows/ci.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
# over time).
4646
- name: Add cache for cargo
4747
id: cache
48-
uses: actions/cache@v3
48+
uses: actions/cache@v4
4949
with:
5050
path: |
5151
# Taken from <https://doc.rust-lang.org/nightly/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci>.
@@ -61,7 +61,7 @@ jobs:
6161
restore-keys: cargo-${{ runner.os }}-reset20240425
6262

6363
- name: Install tools
64-
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
64+
if: steps.cache.outputs.cache-hit != 'true'
6565
run: cargo install -f rustup-toolchain-install-master hyperfine
6666

6767
- name: Install miri toolchain
@@ -78,6 +78,12 @@ jobs:
7878
rustc -Vv
7979
cargo -V
8080
81+
# The `style` job only runs on Linux; this makes sure the Windows-host-specific
82+
# code is also covered by clippy.
83+
- name: Check clippy
84+
if: matrix.os == 'windows-latest'
85+
run: ./miri clippy -- -D warnings
86+
8187
- name: Test Miri
8288
run: ./ci/ci.sh
8389

@@ -95,7 +101,7 @@ jobs:
95101
# over time).
96102
- name: Add cache for cargo
97103
id: cache
98-
uses: actions/cache@v3
104+
uses: actions/cache@v4
99105
with:
100106
path: |
101107
# Taken from <https://doc.rust-lang.org/nightly/cargo/guide/cargo-home.html#caching-the-cargo-home-in-ci>.
@@ -111,7 +117,7 @@ jobs:
111117
restore-keys: cargo-${{ runner.os }}-reset20240331
112118

113119
- name: Install rustup-toolchain-install-master
114-
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
120+
if: steps.cache.outputs.cache-hit != 'true'
115121
run: cargo install -f rustup-toolchain-install-master
116122

117123
- name: Install "master" toolchain

0 commit comments

Comments
 (0)