Weekly upstream merge

.github/workflows/main.yml

@@ -498,28 +498,6 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
 
-  # Build and test the wasi-crypto module.
-  test_wasi_crypto:
-    needs: determine
-    if: needs.determine.outputs.run-full
-    name: Test wasi-crypto module
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-      with:
-        submodules: true
-    - run: rustup update stable && rustup default stable
-    - run: rustup target add wasm32-wasi
-    - run: ./ci/run-wasi-crypto-example.sh
-      env:
-        RUST_BACKTRACE: 1
-
-    # 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 }}
-
   build-preview1-component-adapter:
     name: Build wasi-preview1-component-adapter
     needs: determine
@@ -768,7 +746,6 @@ jobs:
       - checks_winarm64
       - fuzz_targets
       - test_wasi_nn
-      - test_wasi_crypto
       - bench
       - meta_deterministic_check
       - verify-publish

.gitmodules

@@ -10,9 +10,6 @@
 [submodule "crates/wasi-nn/spec"]
 	path = crates/wasi-nn/spec
 	url = https://github.com/WebAssembly/wasi-nn
-[submodule "crates/wasi-crypto/spec"]
-	path = crates/wasi-crypto/spec
-	url = https://github.com/WebAssembly/wasi-crypto.git
 [submodule "tests/wasi_testsuite/wasi-threads"]
 	path = tests/wasi_testsuite/wasi-threads
 	url = https://github.com/WebAssembly/wasi-threads