Skip to content

Commit 3a14a5c

Browse files
committed
unpin nightly and disable weak memory emulation
1 parent 9eb6928 commit 3a14a5c

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.github/workflows/ci.yml

+13-13
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,18 @@ jobs:
7676
timeout-minutes: 60
7777
steps:
7878
- uses: actions/checkout@v3
79-
# TODO: re-enable cache once nightly is unpinned
80-
# - uses: actions/cache@v3
81-
# with:
82-
# path: |
83-
# ~/.cargo/bin/
84-
# ~/.cargo/registry/index/
85-
# ~/.cargo/registry/cache/
86-
# ~/.cargo/git/db/
87-
# target/
88-
# key: ${{ runner.os }}-cargo-miri-${{ hashFiles('**/Cargo.toml') }}
79+
- uses: actions/cache@v3
80+
with:
81+
path: |
82+
~/.cargo/bin/
83+
~/.cargo/registry/index/
84+
~/.cargo/registry/cache/
85+
~/.cargo/git/db/
86+
target/
87+
key: ${{ runner.os }}-cargo-miri-${{ hashFiles('**/Cargo.toml') }}
8988
- uses: actions-rs/toolchain@v1
9089
with:
91-
# TODO: check again with nightly once https://github.com/rust-lang/miri/issues/2223 is fixed
92-
toolchain: nightly-2022-06-08
90+
toolchain: nightly
9391
components: miri
9492
override: true
9593
- name: Install alsa and udev
@@ -104,7 +102,9 @@ jobs:
104102
# to track down because allocids are nondeterministic.
105103
# -Zmiri-tag-raw-pointers is not strictly "necessary" but enables a lot of extra UB checks relating
106104
# to raw pointer aliasing rules that we should be trying to uphold.
107-
MIRIFLAGS: -Zmiri-disable-isolation -Zmiri-ignore-leaks -Zmiri-tag-raw-pointers
105+
# TODO: remove once https://github.com/rust-lang/miri/issues/2223 is fixed
106+
# -Zmiri-disable-weak-memory-emulation
107+
MIRIFLAGS: -Zmiri-disable-isolation -Zmiri-ignore-leaks -Zmiri-tag-raw-pointers -Zmiri-disable-weak-memory-emulation
108108

109109
check-compiles:
110110
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)