Revert "Merge upstream changes that have occurred since the fork (#59)…

…" (#60) This reverts commit 0402edd. The final result in the main branch did not retain the merge commit, so trying to merge the `upstream/main` again now produces significant conflicts even though they should not be present.
near · Oct 31, 2023 · 89da0ab · 89da0ab
1 parent a5adf80
commit 89da0ab
Show file tree

Hide file tree

Showing 1,172 changed files with 101,645 additions and 115,444 deletions.
diff --git a/.github/actions/binary-compatible-builds/main.js b/.github/actions/binary-compatible-builds/main.js
@@ -34,7 +34,7 @@ if (process.env.CENTOS !== undefined) {
   return;
 }
 
-const name = process.env.INPUT_NAME.replace(/-min$/, '');
+const name = process.env.INPUT_NAME;
 
 child_process.execFileSync('docker', [
   'build',

diff --git a/.github/actions/install-rust/action.yml b/.github/actions/install-rust/action.yml
@@ -61,14 +61,6 @@ runs:
         CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
         EOF
 
-    - name: Require semicolons in WIT
-      shell: bash
-      run: echo WIT_REQUIRE_SEMICOLONS=1 >> "$GITHUB_ENV"
-
-    - name: Install the WASI target
-      shell: bash
-      run: rustup target add wasm32-wasi wasm32-unknown-unknown
-
     - name: Choose registry cache key
       shell: bash
       # Update the registry index cache at most once per day. actions/cache

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -125,7 +125,6 @@ jobs:
     outputs:
       run-full: ${{ steps.calculate.outputs.run-full }}
       test-matrix: ${{ steps.calculate.outputs.test-matrix }}
-      build-matrix: ${{ steps.calculate.outputs.build-matrix }}
       test-capi: ${{ steps.calculate.outputs.test-capi }}
       build-fuzz: ${{ steps.calculate.outputs.build-fuzz }}
       audit: ${{ steps.calculate.outputs.audit }}
@@ -171,9 +170,6 @@ jobs:
         echo "test-matrix={\"include\":$(echo $matrix)}" >> $GITHUB_OUTPUT
         echo "$matrix"
 
-        matrix="$(node ./ci/build-build-matrix.js)"
-        echo "build-matrix={\"include\":$(echo $matrix)}" >> $GITHUB_OUTPUT
-
         if [ "$run_full" = "true" ]; then
             echo run-full=true >> $GITHUB_OUTPUT
             echo test-capi=true >> $GITHUB_OUTPUT
@@ -200,7 +196,7 @@ jobs:
         submodules: true
     - uses: ./.github/actions/install-rust
       with:
-        toolchain: nightly-2023-10-10
+        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 -
@@ -270,7 +266,8 @@ jobs:
     # Check some feature combinations of the `wasmtime` crate
     - run: cargo check -p wasmtime --no-default-features
     - run: cargo check -p wasmtime --no-default-features --features wat
-    - run: cargo check -p wasmtime --no-default-features --features profiling
+    - run: cargo check -p wasmtime --no-default-features --features jitdump
+    - run: cargo check -p wasmtime --no-default-features --features vtune
     - run: cargo check -p wasmtime --no-default-features --features cache
     - run: cargo check -p wasmtime --no-default-features --features async
     - run: cargo check -p wasmtime --no-default-features --features pooling-allocator
@@ -279,20 +276,12 @@ jobs:
     - run: cargo check -p wasmtime --no-default-features --features cranelift,wat,async,cache
     - run: cargo check -p wasmtime --no-default-features --features winch
     - run: cargo check -p wasmtime --no-default-features --features wmemcheck
-    - run: cargo check -p wasmtime --no-default-features --features demangle
-    - run: cargo check -p wasmtime --no-default-features --features addr2line
     - run: cargo check --features component-model
     - run: cargo check -p wasmtime --features incremental-cache
 
-    # Feature combinations of the `wasmtime-cli`
-    - run: cargo check -p wasmtime-cli --no-default-features
-
     # Check that benchmarks of the cranelift project build
     - run: cargo check --benches -p cranelift-codegen
 
-    # Check that the bench-api compiles
-    - run: cargo check -p wasmtime-bench-api
-
     # Check some feature combinations of the `wasmtime-c-api` crate
     - run: cargo check -p wasmtime-c-api --no-default-features
     - run: cargo check -p wasmtime-c-api --no-default-features --features wat
@@ -367,7 +356,7 @@ jobs:
     # flags to rustc.
     - uses: ./.github/actions/install-rust
       with:
-        toolchain: nightly-2023-10-10
+        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`.
@@ -394,9 +383,9 @@ jobs:
     name: ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
     env:
-      QEMU_BUILD_VERSION: 8.1.1
+      QEMU_BUILD_VERSION: 8.0.4
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix: ${{ fromJson(needs.determine.outputs.test-matrix) }}
     steps:
     - uses: actions/checkout@v3
@@ -416,6 +405,8 @@ jobs:
       if: matrix.target == 'x86_64-pc-windows-gnu'
 
     - run: cargo fetch --locked
+    - run: cargo fetch --locked --manifest-path crates/test-programs/wasi-tests/Cargo.toml
+    - run: cargo fetch --locked --manifest-path crates/test-programs/wasi-http-tests/Cargo.toml
 
     - uses: actions/cache@v3
       with:
@@ -453,6 +444,7 @@ jobs:
         # quickly.
         curl https://download.qemu.org/qemu-$QEMU_BUILD_VERSION.tar.xz | tar xJf -
         cd qemu-$QEMU_BUILD_VERSION
+        patch -p1 < $GITHUB_WORKSPACE/ci/qemu-cpuinfo.patch
         ./configure --target-list=${{ matrix.qemu_target }} --prefix=${{ runner.tool_cache}}/qemu --disable-tools --disable-slirp --disable-fdt --disable-capstone --disable-docs
         ninja -C build install
         touch ${{ runner.tool_cache }}/qemu/built
@@ -510,7 +502,7 @@ jobs:
           submodules: true
       - uses: ./.github/actions/install-rust
       - run: rustup target add wasm32-wasi
-      - uses: abrown/install-openvino-action@v7
+      - uses: abrown/install-openvino-action@v6
         with:
           version: 2022.3.0
           apt: true
@@ -648,7 +640,7 @@ jobs:
         submodules: true
     - uses: ./.github/actions/install-rust
       with:
-        toolchain: nightly-2023-10-10
+        toolchain: nightly-2023-07-02
     - run: rustup component add rust-src miri
     - uses: actions/cache@v3
       with:
@@ -674,42 +666,62 @@ jobs:
   # Perform release builds of `wasmtime` and `libwasmtime.so`. Builds a variety
   # of platforms and architectures and then uploads the release artifacts to
   # this workflow run's list of artifacts.
-  #
-  # Note that the full matrix is computed by `ci/build-build-matrix.js`.
   build:
     needs: determine
     if: needs.determine.outputs.run-full
     name: Release build for ${{ matrix.build }}
     runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
-      matrix: ${{ fromJson(needs.determine.outputs.build-matrix) }}
+      matrix:
+        include:
+        - build: x86_64-linux
+          os: ubuntu-latest
+        - build: x86_64-macos
+          os: macos-latest
+        - build: aarch64-macos
+          os: macos-latest
+          target: aarch64-apple-darwin
+        - build: x86_64-windows
+          os: windows-latest
+        - build: x86_64-mingw
+          os: windows-latest
+          target: x86_64-pc-windows-gnu
+        - build: aarch64-linux
+          os: ubuntu-latest
+          target: aarch64-unknown-linux-gnu
+        - build: s390x-linux
+          os: ubuntu-latest
+          target: s390x-unknown-linux-gnu
+        - build: riscv64gc-linux
+          os: ubuntu-latest
+          target: riscv64gc-unknown-linux-gnu
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
-
     - uses: ./.github/actions/install-rust
-      with:
-        toolchain: ${{ matrix.rust }}
-    - run: |
-        rustup component add rust-src
-        rustup target add ${{ matrix.target }}
-
     # On one builder produce the source tarball since there's no need to produce
     # it everywhere
     - run: ./ci/build-src-tarball.sh
       if: matrix.build == 'x86_64-linux'
     - uses: ./.github/actions/binary-compatible-builds
       with:
         name: ${{ matrix.build }}
+    - run: |
+        echo CARGO_BUILD_TARGET=${{ matrix.target }} >> $GITHUB_ENV
+        rustup target add ${{ matrix.target }}
+      if: matrix.target != ''
+
+    # Build `wasmtime` and executables. Note that we include some non-default
+    # features so the # release artifacts can be maximally feature-ful.
+    - run: $CENTOS cargo build --release --bin wasmtime --features all-arch,component-model
 
-    - run: $CENTOS ./ci/build-release-artifacts.sh "${{ matrix.build }}" "${{ matrix.target }}"
+    # Build `libwasmtime.so`
+    - run: $CENTOS cargo build --release --manifest-path crates/c-api/Cargo.toml
 
-    # Assemble release artifacts appropriate for this platform, then upload them
+    # Assemble release artifats appropriate for this platform, then upload them
     # unconditionally to this workflow's files so we have a copy of them.
     - run: ./ci/build-tarballs.sh "${{ matrix.build }}" "${{ matrix.target }}"
-
     - uses: actions/upload-artifact@v3
       with:
         name: bins-${{ matrix.build }}

diff --git a/.github/workflows/publish-artifacts.yml b/.github/workflows/publish-artifacts.yml
@@ -28,8 +28,6 @@ jobs:
       env:
         GH_TOKEN: ${{ github.token }}
 
-    - run: ./ci/merge-artifacts.sh
-
     # Deploy the `gh-pages.tar.gz` artifact to the `gh-pages` branch.
     - run: tar xf gh-pages.tar.gz
       working-directory: gh-pages
@@ -43,6 +41,10 @@ jobs:
 
     - run: npm install --production
       working-directory: .github/actions/github-release
+    - run: |
+        mkdir dist
+        mv -t dist bins-*/*.tar.*
+        mv -t dist bins-*/*.{zip,msi,wasm}
     - name: Publish Release
       uses: ./.github/actions/github-release
       with:

diff --git a/.gitignore b/.gitignore
@@ -21,5 +21,3 @@ foo
 publish
 vendor
 examples/build
-examples/.cache
-*.coredump