Merge branch 'main' into eliza/ci-stuff

.github/workflows/ci.yml

@@ -64,12 +64,10 @@ jobs:
     steps:
     - name: install libudev
       run: sudo apt-get update && sudo apt-get install -y libudev-dev
-    - name: install rust toolchain
+    - uses: actions/checkout@v2
+    - name: rust toolchain
       run: rustup show
-    - name: add wasm target
-      run: rustup target add wasm32-unknown-unknown
     - uses: olix0r/cargo-action-fmt@ee1ef42932e44794821dab57ef1bf7a73df8b21f
-    - uses: actions/checkout@v2
     - uses: extractions/setup-just@v1
     - name: run just check
       run: just check
@@ -83,12 +81,10 @@ jobs:
     steps:
     - name: install libudev
       run: sudo apt-get update && sudo apt-get install -y libudev-dev
-    - name: install rust toolchain
+    - uses: actions/checkout@v2
+    - name: rust toolchain
       run: rustup show
-    - name: add wasm target
-      run: rustup target add wasm32-unknown-unknown
     - uses: olix0r/cargo-action-fmt@ee1ef42932e44794821dab57ef1bf7a73df8b21f
-    - uses: actions/checkout@v2
     - uses: extractions/setup-just@v1
     - name: run just clippy
       run: just clippy
@@ -102,10 +98,10 @@ jobs:
     runs-on: ubuntu-latest
     needs: check
     steps:
-    - name: install rust toolchain
+    - uses: actions/checkout@v2
+    - name: rust toolchain
       run: rustup show
     - uses: olix0r/cargo-action-fmt@ee1ef42932e44794821dab57ef1bf7a73df8b21f
-    - uses: actions/checkout@v2
     # note that this actually *needs* to be `--release`, because the D1 platform
     # impl apparently just Does Not Build in debug mode (debug builds fail with
     # a pile of linker errors, what the heck...)
@@ -123,34 +119,36 @@ jobs:
       run: |
         sudo apt-get update \
         && sudo apt-get install -y libudev-dev libsdl2-dev
-    - name: install rust toolchain
+    - uses: actions/checkout@v2
+    - name: rust toolchain
       run: rustup show
     - name: install nextest
       uses: taiki-e/install-action@v2
       with:
         tool: [email protected]
-    - uses: actions/checkout@v2
     - uses: extractions/setup-just@v1
     - name: just test
       run: just test
 
   # (test-host forth3) - run miri tests
   test-host-miri:
     runs-on: ubuntu-latest
-    name: cargo miri test (host)
+    name: cargo miri test --package forth3 (host)
     needs: check
     # TODO(eliza): only run this if forth3 changed?
     # needs: changed_paths
     # if: needs.changed_paths.outputs.should_skip != 'true'
     steps:
-    - name: install rust toolchain and miri
-      run: |
-        rustup toolchain install nightly --component miri
-        cargo +nightly miri setup
     - uses: actions/checkout@v3
+    - name: rust toolchain
+      run: rustup show
+    - name: install Miri
+      run: |
+        rustup component add miri
+        cargo miri setup
     - name: cargo miri test (forth3)
       run: |
-        cargo +nightly miri test \
+        cargo miri test \
           --package forth3 \
           --all-features
 
@@ -160,9 +158,9 @@ jobs:
     # if: needs.changed_paths.outputs.should_skip != 'true'
     runs-on: ubuntu-latest
     steps:
+    - uses: actions/checkout@v2
     - name: install rust toolchain
       run: rustup show
-    - uses: actions/checkout@v2
     - name: run rustfmt
       run: cargo fmt --check
 
@@ -176,9 +174,9 @@ jobs:
     steps:
     - name: install libudev
       run: sudo apt-get update && sudo apt-get install -y libudev-dev
-    - name: install rust toolchain
-      run: rustup show
     - uses: actions/checkout@v2
+    - name: rust toolchain
+      run: rustup show
     - uses: olix0r/cargo-action-fmt@ee1ef42932e44794821dab57ef1bf7a73df8b21f
     - uses: extractions/setup-just@v1
     - name: run rustdoc