Skip to content

Commit

Permalink
Merge pull request #5149 from wasmerio/release-5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
xdoardo authored Oct 17, 2024
2 parents 8fccddd + f4a25d1 commit 9b8dcf8
Show file tree
Hide file tree
Showing 450 changed files with 135,307 additions and 11,945 deletions.
4 changes: 2 additions & 2 deletions .github/cross-linux-riscv64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.74
RUN rustup -v toolchain install 1.81
# add docker the manual way
COPY install_docker.sh /
RUN /install_docker.sh
Expand Down Expand Up @@ -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.74-x86_64-unknown-linux-gnu
RUN rustup target add riscv64gc-unknown-linux-gnu --toolchain 1.81-x86_64-unknown-linux-gnu

#compile libssl-dev for riscv64!
COPY build_openssl.sh /
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

env:
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
MSRV: "1.74"
MSRV: "1.81"

jobs:
run_benchmark:
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Builds
env:
RUST_BACKTRACE: 1
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: git
MSRV: "1.74"
MSRV: "1.81"

on:
push:
Expand Down Expand Up @@ -46,14 +46,14 @@ jobs:
- build: linux-x64
os: ubuntu-20.04
artifact_name: 'wasmer-linux-amd64'
llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/15.x/llvm-linux-amd64.tar.xz'
llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-linux-amd64.tar.xz'
cross_compilation_artifact_name: 'cross_compiled_from_linux'
use_sccache: false
use_llvm: true
build_wasm: true
- build: macos-x64
os: macos-12
llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/15.x/llvm-darwin-amd64.tar.xz'
llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-darwin-amd64.tar.xz'
artifact_name: 'wasmer-darwin-amd64'
cross_compilation_artifact_name: 'cross_compiled_from_mac'
use_sccache: false
Expand All @@ -66,18 +66,19 @@ jobs:
use_sccache: false
use_llvm: false
build_wasm: false
# [todo] xdoardo: Reinstate when the code we generate for aarch64 is working correctly.
# llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-darwin-aarch64.tar.xz'
- build: windows-x64
os: windows-2019
artifact_name: 'wasmer-windows-amd64'
llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/15.x/llvm-windows-amd64.tar.xz'
llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-windows-amd64.tar.xz'
cross_compilation_artifact_name: 'cross_compiled_from_win'
use_sccache: false
use_llvm: true
build_wasm: false
- build: linux-musl-x64
os: ubuntu-latest
artifact_name: 'wasmer-linux-musl-amd64'
#llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/15.x/llvm-linux-amd64.tar.xz'
container: alpine:latest
use_sccache: false
use_llvm: false
Expand Down Expand Up @@ -113,13 +114,16 @@ jobs:
echo "${LLVM_DIR}/bin" >> $GITHUB_PATH
env:
LLVM_DIR: .llvm
- name: Install MSVC dev-cmd (Windows)
uses: ilammy/msvc-dev-cmd@v1
if: ${{ matrix.metadata.build == 'windows-x64' }}
- name: Configure LLVM (Windows)
# The Custom Windows build does not contains llvm-config.exe, so need to setup manualy here
if: matrix.build == 'windows-x64' && matrix.llvm_url
shell: bash
run: |
LLVM_DIR=$(pwd)/${{ env.LLVM_DIR }}
echo LLVM_SYS_150_PREFIX="${LLVM_DIR}" >> $GITHUB_ENV
echo LLVM_SYS_180_PREFIX="${LLVM_DIR}" >> $GITHUB_ENV
echo LLVM_ENABLE=1 >> $GITHUB_ENV
env:
LLVM_DIR: .llvm
Expand Down
56 changes: 32 additions & 24 deletions .github/workflows/cifuzz.yaml
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
name: CIFuzz
on: [pull_request]
jobs:
Fuzzing:
runs-on: ubuntu-latest
steps:
- name: Build Fuzzers
id: build
uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
with:
oss-fuzz-project-name: 'wasmer'
language: rust
- name: Run Fuzzers
uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
with:
oss-fuzz-project-name: 'wasmer'
language: rust
fuzz-seconds: 300
- name: Upload Crash
uses: actions/upload-artifact@v4
if: failure() && steps.build.outcome == 'success'
with:
name: artifacts
path: ./out/artifacts
#
# [todo] xdoardo (2024/10/17):
#
# We updated our MSRV and llvm, so we need to open a pr here
# https://github.com/google/oss-fuzz/blob/fb88de8bd2d220662271aabbe19427dc24134bf6/projects/wasmer/build.sh
# before re-enabling this.
#
#
# name: CIFuzz
# on: [pull_request]
# jobs:
# Fuzzing:
# runs-on: ubuntu-latest
# steps:
# - name: Build Fuzzers
# id: build
# uses: google/oss-fuzz/infra/cifuzz/actions/build_fuzzers@master
# with:
# oss-fuzz-project-name: 'wasmer'
# language: rust
# - name: Run Fuzzers
# uses: google/oss-fuzz/infra/cifuzz/actions/run_fuzzers@master
# with:
# oss-fuzz-project-name: 'wasmer'
# language: rust
# fuzz-seconds: 300
# - name: Upload Crash
# uses: actions/upload-artifact@v4
# if: failure() && steps.build.outcome == 'success'
# with:
# name: artifacts
# path: ./out/artifacts
2 changes: 1 addition & 1 deletion .github/workflows/cloudcompiler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Release cloudcompiler.wasm

env:
RUST_BACKTRACE: 1
MSRV: "1.74"
MSRV: "1.81"

on:
push:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- 'lib/**'

env:
MSRV: "1.74"
MSRV: "1.81"

jobs:
documentation:
Expand Down
Loading

0 comments on commit 9b8dcf8

Please sign in to comment.