Merge branch 'master' into wasmer-dir

wasmerio · Jun 21, 2023 · 52eed73 · 52eed73
2 parents 2a34a9e + 01de45d
commit 52eed73
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -99,9 +99,9 @@ jobs:
           toolchain: ${{ env.MSRV }}
           target: ${{ matrix.target }}
       - name: Install Rust nightly (to build capi-headless)
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly
+          toolchain: "nightly-2023-05-25"
           target: ${{ matrix.metadata.target }}
       - uses: Swatinem/rust-cache@v2
         if: matrix.use_sccache != true
@@ -224,7 +224,7 @@ jobs:
      #  run: |
      #    make build-wasmer-wasm
       - name: Install Nightly Rust for Headless
-        uses: dtolnay/rust-toolchain@nightly
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: "nightly-2023-05-25"
           target: ${{ matrix.target }}
@@ -279,9 +279,9 @@ jobs:
         with:
           target: x86_64-pc-windows-gnu
       - name: Install Rust nightly (to build capi-headless)
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly
+          toolchain: "nightly-2023-05-25"
           target: x86_64-pc-windows-gnu
       - name: Install Windows-GNU target
         shell: bash

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -367,9 +367,9 @@ jobs:
           toolchain: ${{ env.MSRV }}
           target: ${{ matrix.metadata.target }}
       - name: Install Rust nightly (to build capi-headless)
-        uses: dtolnay/rust-toolchain@stable
+        uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly
+          toolchain: "nightly-2023-05-25"
           target: ${{ matrix.metadata.target }}
       - name: Install Windows-GNU linker
         if: ${{ matrix.metadata.build == 'windows-gnu' }}

diff --git a/.github/workflows/web.yaml b/.github/workflows/web.yaml
@@ -18,14 +18,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        rust: [nightly]
+        rust: [nightly-2023-05-25]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
 
     - name: Install Rust
-      uses: actions/checkout@v3
+      uses: dtolnay/rust-toolchain@master
       with:
         toolchain: ${{ matrix.rust }}
 
@@ -37,6 +37,8 @@ jobs:
       shell: bash
       run: |
         cd lib/wasi-web
+        rustup override set nightly-2023-05-25
+        rustup component add rustfmt
         cargo fmt --check
 
     - name: Check