feat(wasmer): Update build scripts to latest release (google#12686)

We recently released a new version of Wasmer and, among other things, we now use LLVM 18 and rust 1.81: this small patch bumps them to the correct versions in the scripts. --------- Co-authored-by: Vitor Guidi <[email protected]>
mircomir · Nov 7, 2024 · 7f138b9 · 7f138b9
1 parent 84e73c1
commit 7f138b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/projects/wasmer/Dockerfile b/projects/wasmer/Dockerfile
@@ -17,17 +17,17 @@
 FROM gcr.io/oss-fuzz-base/base-builder-rust
 
 RUN apt-get update && apt-get install -y make autoconf automake libtool \
-   zlib1g-dev libffi-dev build-essential libxml2-dev
+	zlib1g-dev libffi-dev build-essential libxml2-dev
 
 RUN git clone --depth 1 https://github.com/wasmerio/wasmer wasmer
 
 RUN mkdir -p $SRC/.llvm && curl --proto '=https' --tlsv1.2 -sSf \
-    https://github.com/wasmerio/llvm-custom-builds/releases/download/15.x/llvm-linux-amd64.tar.xz -L -o - | \
+    https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-linux-amd64.tar.xz -L -o -| \
     tar xJv -C $SRC/.llvm
 
 WORKDIR wasmer
 
 # dead code warnings with nightly-2024-07-12
-ENV RUSTUP_TOOLCHAIN nightly-2024-02-12
+ENV RUSTUP_TOOLCHAIN nightly-2024-10-10
 
 COPY build.sh default.options $SRC/
diff --git a/projects/wasmer/build.sh b/projects/wasmer/build.sh
@@ -15,15 +15,11 @@
 #
 ################################################################################
 
-export LLVM_SYS_150_PREFIX=$($SRC/.llvm/bin/llvm-config --prefix)
+export LLVM_SYS_180_PREFIX=$($SRC/.llvm/bin/llvm-config --prefix)
 
 # Needed for coverage to work.
 nightly="+$RUSTUP_TOOLCHAIN"
 
-pushd $SRC/wasmer/fuzz
-cargo update -p serde --precise 1.0.203
-popd
-
 cargo $nightly fuzz build universal_cranelift --features=universal,cranelift -O
 cargo $nightly fuzz build universal_llvm --features=universal,llvm -O
 cargo $nightly fuzz build universal_singlepass --features=universal,singlepass -O

diff --git a/projects/wasmer/project.yaml b/projects/wasmer/project.yaml
@@ -1,11 +1,11 @@
 homepage: "https://github.com/wasmerio/wasmer"
 language: rust
 main_repo: "https://github.com/wasmerio/wasmer"
-primary_contact: "syrus@wasmer.io"
+primary_contact: "edoardo@wasmer.io"
 auto_ccs:
-  - michael@wasmer.io
-  - felix@wasmer.io
-  - sebastien@wasmer.io
+  - syrus@wasmer.io
+  - christoph@wasmer.io
+  - amin@wasmer.io
 sanitizers:
   - address
 fuzzing_engines: