Merge with upstream

.github/actions/install-rust/action.yml

@@ -6,6 +6,18 @@ inputs:
     description: 'Default toolchan to install'
     required: false
     default: 'default'
+  msrv_range:
+    description: 'Versions later-than-latest-Rust the MSRV supports'
+    required: false
+    # Note that this is currently set to 3 as the MSRV is 1.78 and current
+    # stable is 1.81. Currently MSRV cannot be updated as it would break the
+    # build on OSS-Fuzz which hasn't updated its Rust compiler in quite some time.
+    #
+    # Updating OSS-Fuzz is being done in
+    # https://github.com/google/oss-fuzz/pull/12365 but it's taking some time,
+    # so for now this'll get bumped instead of MSRV while we wait for the update
+    # to happen.
+    default: '3'
 
 runs:
   using: composite
@@ -17,13 +29,14 @@ runs:
         # Determine MSRV as N in `1.N.0` by looking at the `rust-version`
         # located in the root `Cargo.toml`.
         msrv=$(grep 'rust-version.*1' Cargo.toml | sed 's/.*\.\([0-9]*\)\..*/\1/')
+        range=${{ inputs.msrv_range }}
 
         if [ "${{ inputs.toolchain }}" = "default" ]; then
-          echo "version=1.$((msrv+2)).0" >> "$GITHUB_OUTPUT"
+          echo "version=1.$((msrv+range)).0" >> "$GITHUB_OUTPUT"
         elif [ "${{ inputs.toolchain }}" = "msrv" ]; then
           echo "version=1.$msrv.0" >> "$GITHUB_OUTPUT"
         elif [ "${{ inputs.toolchain }}" = "wasmtime-ci-pinned-nightly" ]; then
-          echo "version=nightly-2024-08-12" >> "$GITHUB_OUTPUT"
+          echo "version=nightly-2024-09-05" >> "$GITHUB_OUTPUT"
         else
           echo "version=${{ inputs.toolchain }}" >> "$GITHUB_OUTPUT"
         fi

.github/workflows/main.yml

@@ -339,7 +339,6 @@ jobs:
   # here isn't to run tests, mostly just serve as a double-check that Rust code
   # compiles and is likely to work everywhere else.
   micro_checks:
-    needs: determine
     name: Check ${{matrix.name}}
     strategy:
       fail-fast: true
@@ -420,12 +419,9 @@ jobs:
       env:
         GH_TOKEN: ${{ github.token }}
 
-  # Similar to `micro_checks` but where we need to install some more state
-  # (e.g. Android NDK) and we haven't factored support for those things out into
-  # a parallel jobs yet.
-  monolith_checks:
-    needs: determine
-    name: Monolith Checks
+  # Checks for no_std support, ensure that crates can build on a no_std target
+  no_std_checks:
+    name: no_std checks
     runs-on: ubuntu-latest
     env:
       CARGO_NDK_VERSION: 2.12.2
@@ -435,14 +431,53 @@ jobs:
         submodules: true
     - uses: ./.github/actions/install-rust
 
-    # Checks for no_std support, ensure that crates can build on a no_std
-    # target
     # NOTE(dhil): Currently, we only support x86_64 Linux.
     # - run: rustup target add x86_64-unknown-none
     # - run: cargo check --target x86_64-unknown-none -p wasmtime --no-default-features --features runtime,gc,component-model
     # - run: cargo check --target x86_64-unknown-none -p cranelift-control --no-default-features
     # - run: cargo check --target x86_64-unknown-none -p pulley-interpreter --features encode,decode,disas,interp
 
+    # common logic to cancel the entire run if this job fails
+    - run: gh run cancel ${{ github.run_id }}
+      if: failure() && github.event_name != 'pull_request'
+      env:
+        GH_TOKEN: ${{ github.token }}
+
+  # Check that Clippy lints are passing.
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    env:
+      CARGO_NDK_VERSION: 2.12.2
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - uses: ./.github/actions/install-rust
+
+    - run: rustup component add clippy
+    - run: cargo clippy --workspace --all-targets
+
+    # common logic to cancel the entire run if this job fails
+    - run: gh run cancel ${{ github.run_id }}
+      if: failure() && github.event_name != 'pull_request'
+      env:
+        GH_TOKEN: ${{ github.token }}
+
+  # Similar to `micro_checks` but where we need to install some more state
+  # (e.g. Android NDK) and we haven't factored support for those things out into
+  # a parallel jobs yet.
+  monolith_checks:
+    name: Monolith Checks
+    runs-on: ubuntu-latest
+    env:
+      CARGO_NDK_VERSION: 2.12.2
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - uses: ./.github/actions/install-rust
+
     # Check that wasmtime compiles with panic=abort since there's some `#[cfg]`
     # for specifically panic=abort there.
     - run: cargo check -p wasmtime
@@ -469,10 +504,6 @@ jobs:
     - run: rustup target add x86_64-unknown-freebsd
     - run: cargo check -p wasmtime --no-default-features --features cranelift,wat,async,cache --target x86_64-unknown-freebsd
 
-    # Run clippy configuration
-    - run: rustup component add clippy
-    - run: cargo clippy --workspace --all-targets
-
     # Re-vendor all WIT files and ensure that they're all up-to-date by ensuring
     # that there's no git changes.
     - name: Re-vendor WIT
@@ -698,6 +729,11 @@ jobs:
           echo "::warning::This CI run will not test MPK; it has been detected as not available on this machine (\`cargo run --example mpk-available\`)."
         fi
 
+    # Install VTune, see `cli_tests::profile_with_vtune`.
+    - name: Install VTune
+      if: matrix.filter == 'linux-x64' && contains(matrix.bucket, 'wasmtime-cli')
+      uses: abrown/install-vtune-action@v1
+
     # Build and test all features
     - run: ./ci/run-tests.sh --locked ${{ matrix.bucket }}
       env:
@@ -1161,6 +1197,8 @@ jobs:
       - cargo_vet
       - doc
       - micro_checks
+      - no_std_checks
+      - clippy
       - monolith_checks
       - checks_winarm64
       - bench

.github/workflows/release-process.yml

@@ -32,6 +32,9 @@ on:
         required: false
         default: 'cut'
 
+permissions:
+  contents: write
+
 jobs:
   release_process:
     if: "github.repository == 'bytecodealliance/wasmtime' || !github.event.schedule"