Merge pull request bytecodealliance#50 from dhil/weekly-merge

Weekly merge
frank-emrich · Jul 15, 2023 · 8516a0c · 8516a0c
2 parents 48248ee + e5ad4f8
commit 8516a0c
Show file tree

Hide file tree

Showing 174 changed files with 5,976 additions and 1,342 deletions.
diff --git a/.github/actions/install-cargo-vet/action.yml b/.github/actions/install-cargo-vet/action.yml
@@ -0,0 +1,20 @@
+name: 'Install the `cargo-vet` tool'
+description: 'Runs `cargo install cargo-vet`'
+
+inputs:
+  version:
+    description: 'Version to install'
+    required: false
+    default: '0.8.0'
+
+runs:
+  using: composite
+  steps:
+    - uses: actions/cache@v3
+      with:
+        path: ${{ runner.tool_cache }}/cargo-vet
+        key: cargo-vet-bin-${{ inputs.version }}
+    - run: echo "${{ runner.tool_cache }}/cargo-vet/bin" >> $GITHUB_PATH
+      shell: bash
+    - run: cargo install --root ${{ runner.tool_cache }}/cargo-vet --version ${{ inputs.version }} cargo-vet
+      shell: bash
diff --git a/.github/actions/install-rust/action.yml b/.github/actions/install-rust/action.yml
@@ -5,7 +5,7 @@ inputs:
   toolchain:
     description: 'Default toolchan to install'
     required: false
-    default: '1.69.0'
+    default: '1.71.0'
   lockfiles:
     description: 'Path glob for Cargo.lock files to use as cache keys'
     required: false

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -86,19 +86,12 @@ jobs:
     needs: determine
     if: needs.determine.outputs.audit
     runs-on: ubuntu-latest
-    env:
-      CARGO_VET_VERSION: 0.8.0
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
     - uses: ./.github/actions/install-rust
-    - uses: actions/cache@v3
-      with:
-        path: ${{ runner.tool_cache }}/cargo-vet
-        key: cargo-vet-bin-${{ env.CARGO_VET_VERSION }}
-    - run: echo "${{ runner.tool_cache }}/cargo-vet/bin" >> $GITHUB_PATH
-    - run: cargo install --root ${{ runner.tool_cache }}/cargo-vet --version ${{ env.CARGO_VET_VERSION }} cargo-vet
+    - uses: ./.github/actions/install-cargo-vet
     - run: cargo vet --locked
 
     # common logic to cancel the entire run if this job fails
@@ -194,7 +187,7 @@ jobs:
         submodules: true
     - uses: ./.github/actions/install-rust
       with:
-        toolchain: nightly-2023-03-20
+        toolchain: nightly-2023-07-02
 
     # Build C API documentation
     - run: curl -L https://sourceforge.net/projects/doxygen/files/rel-1.9.3/doxygen-1.9.3.linux.bin.tar.gz/download | tar xzf -
@@ -353,7 +346,7 @@ jobs:
     # flags to rustc.
     - uses: ./.github/actions/install-rust
       with:
-        toolchain: nightly-2023-03-20
+        toolchain: nightly-2023-07-02
     - run: cargo install cargo-fuzz --vers "^0.11"
     # Install the OCaml packages necessary for fuzz targets that use the
     # `wasm-spec-interpreter`.
@@ -651,7 +644,7 @@ jobs:
         submodules: true
     - uses: ./.github/actions/install-rust
       with:
-        toolchain: nightly-2023-03-20
+        toolchain: nightly-2023-07-02
     - run: rustup component add rust-src miri
     - uses: actions/cache@v3
       with:

diff --git a/.github/workflows/release-process.yml b/.github/workflows/release-process.yml
@@ -48,6 +48,9 @@ jobs:
           git config user.email 'wasmtime-publish@users.noreply.github.com'
           git remote set-url origin https://git:${{ secrets.PERSONAL_ACCESS_TOKEN }}@github.com/${{ github.repository }}
 
+      - uses: ./.github/actions/install-rust
+      - uses: ./.github/actions/install-cargo-vet
+
       - name: Bump major version number
         run: |
           set -ex
@@ -66,6 +69,9 @@ jobs:
           cat backup-releases >> RELEASES.md
           rm backup-releases
 
+          # Update `cargo vet` entries for all the new crate versions
+          cargo vet
+
           # Commit all of the above changes.
           git commit -am "Bump Wasmtime to $num"