Merge pull request #225 from alexcrichton/merge

Merge with upstream

Author: alexcrichton

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

@@ -28,7 +28,7 @@ runs:
         elif [ "${{ inputs.toolchain }}" = "msrv" ]; then
           echo "version=1.$msrv.0" >> "$GITHUB_OUTPUT"
         elif [ "${{ inputs.toolchain }}" = "wasmtime-ci-pinned-nightly" ]; then
-          echo "version=nightly-2025-06-06" >> "$GITHUB_OUTPUT"
+          echo "version=nightly-2025-07-08" >> "$GITHUB_OUTPUT"
         else
           echo "version=${{ inputs.toolchain }}" >> "$GITHUB_OUTPUT"
         fi

.github/workflows/main.yml

@@ -613,7 +613,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        os: [ubuntu-24.04, macos-14, windows-2025]
+        os: [ubuntu-24.04, macos-15, windows-2025]
 
     steps:
     - uses: actions/checkout@v4
@@ -812,6 +812,23 @@ jobs:
     # Run the tests!
     - run: cargo test -p wasmtime-wasi-nn --features ${{ matrix.feature }}
 
+  # Test `wasmtime-wasi-tls-nativetls` in its own job. This is because it
+  # depends on OpenSSL, which is not easily available on all platforms.
+  test_wasi_tls_nativetls:
+    name: Test wasi-tls using native-tls provider
+    needs: determine
+    if: needs.determine.outputs.run-full
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: true
+    - uses: ./.github/actions/install-rust
+    - run: cargo test -p wasmtime-wasi-tls-nativetls
+
   # Test the `wasmtime-fuzzing` crate. Split out from the main tests because
   # `--all-features` brings in OCaml, which is a pain to get setup for all
   # targets.
@@ -1114,6 +1131,7 @@ jobs:
       - doc
       - micro_checks
       - special_tests
+      - test_wasi_tls_nativetls
       - clippy
       - monolith_checks
       - platform_checks