unpin nightly and disable weak memory emulation

bevyengine · Jun 11, 2022 · ef74578 · ef74578
1 parent 772d152
commit ef74578
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,20 +76,18 @@ jobs:
     timeout-minutes: 60
     steps:
       - uses: actions/checkout@v3
-      # TODO: re-enable cache once nightly is unpinned
-      # - uses: actions/cache@v3
-      #   with:
-      #     path: |
-      #       ~/.cargo/bin/
-      #       ~/.cargo/registry/index/
-      #       ~/.cargo/registry/cache/
-      #       ~/.cargo/git/db/
-      #       target/
-      #     key: ${{ runner.os }}-cargo-miri-${{ hashFiles('**/Cargo.toml') }}
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cargo/bin/
+            ~/.cargo/registry/index/
+            ~/.cargo/registry/cache/
+            ~/.cargo/git/db/
+            target/
+          key: ${{ runner.os }}-cargo-miri-${{ hashFiles('**/Cargo.toml') }}
       - uses: actions-rs/toolchain@v1
         with:
-          # TODO: check again with nightly once https://github.com/rust-lang/miri/issues/2223 is fixed
-          toolchain: nightly-2022-06-08
+          toolchain: nightly
           components: miri
           override: true
       - name: Install alsa and udev
@@ -104,7 +102,9 @@ jobs:
           # to track down because allocids are nondeterministic.
           # -Zmiri-tag-raw-pointers is not strictly "necessary" but enables a lot of extra UB checks relating
           # to raw pointer aliasing rules that we should be trying to uphold.
-          MIRIFLAGS: -Zmiri-disable-isolation -Zmiri-ignore-leaks -Zmiri-tag-raw-pointers
+          # TODO: remove once https://github.com/rust-lang/miri/issues/2223 is fixed
+          # -Zmiri-disable-weak-memory-emulation
+          MIRIFLAGS: -Zmiri-disable-isolation -Zmiri-ignore-leaks -Zmiri-tag-raw-pointers -Zmiri-disable-weak-memory-emulation
 
   check-compiles:
     runs-on: ubuntu-latest