Merge commit 'f135527' into adopt-v4.2.8

.config/nextest.toml

@@ -0,0 +1,10 @@
+[profile.ci]
+# Print out output for failing tests as soon as they fail, and also at the end
+# of the run (for easy scrollability).
+failure-output = "immediate-final"
+# Do not cancel the test run on the first failure.
+fail-fast = false
+# Automatically mark a test as "slow" after 60 seconds, then kill it after 180s
+slow-timeout = { period = "60s", terminate-after = 3 }
+# Retry a couple times in case there are flaky tests
+retries = 3

.github/cross-linux-riscv64/Dockerfile

@@ -28,7 +28,7 @@ RUN apt-get update  && \
 # install rust tools
 RUN curl --proto "=https" --tlsv1.2 --retry 3 -sSfL https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
-RUN rustup -v toolchain install 1.70
+RUN rustup -v toolchain install 1.73
 # add docker the manual way
 COPY install_docker.sh /
 RUN /install_docker.sh
@@ -61,7 +61,7 @@ ENV CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER="$CROSS_TOOLCHAIN_PREFIX"gcc
     RUST_TEST_THREADS=1 \
     PKG_CONFIG_PATH="/usr/lib/riscv64-linux-gnu/pkgconfig/:${PKG_CONFIG_PATH}"
 
-RUN rustup target add riscv64gc-unknown-linux-gnu --toolchain 1.70-x86_64-unknown-linux-gnu
+RUN rustup target add riscv64gc-unknown-linux-gnu --toolchain 1.73-x86_64-unknown-linux-gnu
 
 #compile libssl-dev for riscv64!
 COPY build_openssl.sh /

.github/workflows/benchmark.yaml

@@ -7,7 +7,7 @@ on:
 
 env:
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
-  MSRV: "1.70"
+  MSRV: "1.73"
 
 jobs:
   run_benchmark:

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Builds
 env:
   RUST_BACKTRACE: 1
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
-  MSRV: "1.70"
+  MSRV: "1.73"
 
 on:
   push:
@@ -60,7 +60,7 @@ jobs:
             use_llvm: true
             build_wasm: false
           - build: macos-arm64
-            os: macos-11.0
+            os: macos-14
             target: aarch64-apple-darwin
             artifact_name: 'wasmer-darwin-arm64'
             use_sccache: false
@@ -91,18 +91,12 @@ jobs:
       - uses: actions/checkout@v3
       - name: Set up base deps on musl
         if: matrix.build == 'linux-musl-x64'
-        run: |
-            apk add build-base bash musl-dev curl make libtool libffi-dev gcc automake autoconf git openssl-dev g++
+        run: ./scripts/alpine-linux-install-deps.sh
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: ${{ env.MSRV }}
           target: ${{ matrix.target }}
-      - name: Install Rust nightly (to build capi-headless)
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: "nightly-2023-05-25"
-          target: ${{ matrix.metadata.target }}
       - uses: Swatinem/rust-cache@v2
         if: matrix.use_sccache != true
       - name: Install LLVM (macOS Apple Silicon)
@@ -191,17 +185,9 @@ jobs:
           echo 'RUSTC_WRAPPER=${{ runner.tool_cache }}/cargo-sccache/bin/sccache' >> $GITHUB_ENV
         shell: bash
       - name: Build C API headless
-        if: matrix.build != 'macos-arm64'
         shell: bash
         run: |
           make package-capi-headless
-      - name: Build C API headless
-        if: matrix.build == 'macos-arm64'
-        run: |
-          make package-capi-headless
-        env:
-          TARGET: aarch64-apple-darwin
-          TARGET_DIR: target/aarch64-apple-darwin/release
       - name: Build C API
         shell: bash
         run: |
@@ -224,9 +210,10 @@ jobs:
      #  run: |
      #    make build-wasmer-wasm
       - name: Install Nightly Rust for Headless
+        if: matrix.build != 'linux-musl-x64'
         uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "nightly-2023-05-25"
+          toolchain: "nightly-2023-10-05"
           target: ${{ matrix.target }}
           components: "rust-src"
       - name: Build Minimal Wasmer Headless
@@ -244,20 +231,12 @@ jobs:
           echo "incremental = false" >> Cargo.toml
           echo "codegen-units = 1" >> Cargo.toml
           echo "rpath = false" >> Cargo.toml
-          rustup override set nightly-2023-05-25
+          rustup override set nightly-2023-10-05
           make build-wasmer-headless-minimal
           rustup override unset
       - name: Dist
-        if: matrix.build != 'macos-arm64'
-        run: |
-          make distribution
-      - name: Dist macos-arm64
-        if: matrix.build == 'macos-arm64'
         run: |
           make distribution
-        env:
-          TARGET: aarch64-apple-darwin
-          TARGET_DIR: target/aarch64-apple-darwin/release
       - name: Upload Artifacts
         uses: actions/upload-artifact@v3
         with:
@@ -278,11 +257,6 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           target: x86_64-pc-windows-gnu
-      - name: Install Rust nightly (to build capi-headless)
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: "nightly-2023-05-25"
-          target: x86_64-pc-windows-gnu
       - name: Install Windows-GNU target
         shell: bash
         run: |

.github/workflows/cloudcompiler.yaml

@@ -2,7 +2,7 @@ name: Release cloudcompiler.wasm
 
 env:
   RUST_BACKTRACE: 1
-  MSRV: "1.70"
+  MSRV: "1.73"
 
 on:
   push:

.github/workflows/documentation.yaml

@@ -8,7 +8,7 @@ on:
       - 'lib/**'
 
 env:
-  MSRV: "1.70"
+  MSRV: "1.73"
 
 jobs:
   documentation:

.github/workflows/test.yaml

@@ -24,7 +24,8 @@ env:
   # Rust, but it's not stable on 1.69 yet. By explicitly setting the protocol we
   # can override that behaviour
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
-  MSRV: "1.70"
+  MSRV: "1.73"
+  NEXTEST_PROFILE: "ci"
 
 jobs:
 
@@ -97,6 +98,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: EmbarkStudios/cargo-deny-action@v1
+        with:
+          log-level: error
 
   test_nodejs:
     name: Test on NodeJS
@@ -118,6 +121,23 @@ jobs:
         run: |
           make test-js
 
+  test_wasi_fyi:
+    name: Test wasi-fyi
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Rust
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: nightly
+          targets: "wasm32-wasi"
+      - name: Install wasm-pack
+        run: |
+          curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+      - name: make test-wasi-fyi
+        run: |
+          make test-wasi-fyi
+
       # The no_std functionality doesn't work at the moment - no point in testing it.
       # - name: make test-js-core
       #   run: |
@@ -158,7 +178,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "nightly-2023-05-25"
+          toolchain: "nightly-2023-10-05"
           target: x86_64-unknown-linux-gnu
       - run: cargo install toml-cli # toml-cli is required to run `make test-build-docs-rs`
       - name: make test-build-docs-rs-ci
@@ -351,9 +371,7 @@ jobs:
           sudo apt-get install --reinstall g++
       - name: Set up base deps on musl
         if: matrix.metadata.build == 'linux-musl'
-        run: |
-            apk update
-            apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++
+        run: ./scripts/alpine-linux-install-deps.sh
       - name: Set up dependencies for Mac OS
         run: |
           brew install automake
@@ -366,11 +384,8 @@ jobs:
         with:
           toolchain: ${{ env.MSRV }}
           target: ${{ matrix.metadata.target }}
-      - name: Install Rust nightly (to build capi-headless)
-        uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: "nightly-2023-05-25"
-          target: ${{ matrix.metadata.target }}
+      - name: Install Nextest
+        uses: taiki-e/install-action@nextest
       - name: Install Windows-GNU linker
         if: ${{ matrix.metadata.build == 'windows-gnu' }}
         shell: bash
@@ -551,6 +566,12 @@ jobs:
             exe: '',
             llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/clang+llvm-15.0.7-x86_64-apple-darwin21.0.tar.xz'
           },
+          {
+            build: macos-arm64,
+            os: macos-14,
+            target: aarch64-apple-darwin,
+            exe: '',
+          },
           {
             build: windows-x64,
             os: windows-2019,
@@ -580,9 +601,7 @@ jobs:
           sudo apt-get install --reinstall g++
       - name: Set up base deps on musl
         if: matrix.metadata.build == 'linux-musl'
-        run: |
-            apk update
-            apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++
+        run: ./scripts/alpine-linux-install-deps.sh
       - name: Set up dependencies for Mac OS
         run: |
           brew install automake
@@ -595,6 +614,8 @@ jobs:
         with:
           toolchain: ${{ env.MSRV }}
           target: ${{ matrix.metadata.target }}
+      - name: Install Nextest
+        uses: taiki-e/install-action@nextest
       - name: Install LLVM (macOS Apple Silicon)
         if: matrix.metadata.os == 'macos-11.0' && !matrix.metadata.llvm_url
         run: |
@@ -679,9 +700,7 @@ jobs:
           version: 0.10.0
       - name: Set up base deps on musl
         if: matrix.build == 'linux-musl'
-        run: |
-            apk update
-            apk add build-base bash musl-dev curl tar make libtool libffi-dev gcc automake autoconf git openssl-dev g++
+        run: ./scripts/alpine-linux-install-deps.sh
       - uses: actions/download-artifact@v3
         id: download
         with:
@@ -696,6 +715,8 @@ jobs:
         with:
           toolchain: ${{ env.MSRV }}
           target: ${{ matrix.metadata.target }}
+      - name: Install Nextest
+        uses: taiki-e/install-action@nextest
       - name: Cache
         uses: whywaita/actions-cache-s3@v2
         with:

.vscode/settings.json

@@ -8,5 +8,6 @@
         "editor.formatOnSave": true,
         "editor.formatOnPaste": false,
         "editor.formatOnType": false
-    }
+    },
+    "rust-analyzer.showUnlinkedFileNotification": false
 }