Skip to content

Commit

Permalink
Merge branch 'master' into feat_data_and_store_mut
Browse files Browse the repository at this point in the history
  • Loading branch information
ptitSeb authored Feb 27, 2023
2 parents ec14a75 + 87a4961 commit 1405d7f
Show file tree
Hide file tree
Showing 373 changed files with 39,677 additions and 24,134 deletions.
31 changes: 12 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
shell: bash
run: |
VERSION=${GITHUB_REF/refs\/tags\//}
echo ::set-output name=VERSION::${VERSION}
echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
DOING_RELEASE=$(echo $VERSION | grep -c '^[0-9]\+\.[0-9]\+\.[0-9]\+\(-\([a-zA-Z]\+\)\?[0-9]*\)\?$' || true)
echo ::set-output name=DOING_RELEASE::${DOING_RELEASE}
echo "DOING_RELEASE=${DOING_RELEASE}" >> $GITHUB_OUTPUT
echo $VERSION
echo $DOING_RELEASE
Expand All @@ -42,7 +42,7 @@ jobs:
matrix:
include:
- build: linux-x64
os: ubuntu-18.04
os: ubuntu-20.04
artifact_name: 'wasmer-linux-amd64'
llvm_url: 'https://github.com/wasmerio/llvm-custom-builds/releases/download/13.x/llvm-linux-amd64.tar.xz'
cross_compilation_artifact_name: 'cross_compiled_from_linux'
Expand Down Expand Up @@ -87,12 +87,6 @@ jobs:
TARGET: ${{ matrix.target }}
steps:
- uses: actions/checkout@v3
- name: Set up libstdc++ on Linux
if: matrix.build == 'linux-x64'
run: |
sudo apt-get update -y
sudo apt-get install -y --allow-downgrades libstdc++6=8.4.0-1ubuntu1~18.04
sudo apt-get install --reinstall g++-8
- name: Set up base deps on musl
if: matrix.build == 'linux-musl-x64'
run: |
Expand All @@ -107,7 +101,7 @@ jobs:
with:
toolchain: nightly
target: ${{ matrix.metadata.target }}
- uses: Swatinem/rust-cache@v1
- uses: Swatinem/rust-cache@v2
if: matrix.use_sccache != true
- name: Install LLVM (macOS Apple Silicon)
if: matrix.os == 'macos-11.0' && !matrix.llvm_url
Expand Down Expand Up @@ -244,9 +238,8 @@ jobs:
rustup override unset
- name: Build Wasmer with minimal "sys" features
run: |
cargo build --no-default-features --features="sys" --manifest-path=lib/api/Cargo.toml &&
cargo build --manifest-path=lib/cache/Cargo.toml &&
cargo build --manifest-path=lib/vbus/Cargo.toml
cargo build --no-default-features --features="sys" --manifest-path=lib/api/Cargo.toml
cargo build --manifest-path=lib/cache/Cargo.toml
- name: Dist
if: matrix.build != 'macos-arm64'
run: |
Expand All @@ -259,7 +252,7 @@ jobs:
TARGET: aarch64-apple-darwin
TARGET_DIR: target/aarch64-apple-darwin/release
- name: Upload Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.artifact_name }}
path: dist
Expand All @@ -268,9 +261,9 @@ jobs:

windows_gnu:
name: Windows GNU
runs-on: ubuntu-18.04
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Install Windows-GNU linker
shell: bash
run: |
Expand Down Expand Up @@ -331,7 +324,7 @@ jobs:
CARGO_TARGET: x86_64-pc-windows-gnu
TARGET_DIR: target/x86_64-pc-windows-gnu/release
- name: Upload Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: 'wasmer-windows-gnu64'
path: dist
Expand All @@ -342,7 +335,7 @@ jobs:
name: Linux aarch64
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
target: aarch64-unknown-linux-gnu
Expand Down Expand Up @@ -396,7 +389,7 @@ jobs:
TARGET: aarch64-unknown-linux-gnu
TARGET_DIR: target/aarch64-unknown-linux-gnu/release
- name: Upload Artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: wasmer-linux-aarch64
path: dist
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
shell: bash
run: |
VERSION=${GITHUB_REF/refs\/tags\//}
echo ::set-output name=VERSION::${VERSION}
echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
DOING_RELEASE=$(echo $VERSION | grep -c '^[0-9]\+\.[0-9]\+\.[0-9]\+\(-\([a-zA-Z]\+\)\?[0-9]*\)\?$' || true)
echo ::set-output name=DOING_RELEASE::${DOING_RELEASE}
echo "DOING_RELEASE=${DOING_RELEASE}" >> $GITHUB_OUTPUT
echo $VERSION
echo $DOING_RELEASE
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
name: Test wasm build
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: rustup target add wasm32-wasi
run: rustup target add wasm32-wasi
- name: make build-wasmer-wasm
Expand All @@ -139,7 +139,7 @@ jobs:
}
]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.61
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:
TARGET_DIR: target/aarch64-unknown-linux-gnu/release
- name: Upload Artifacts
if: ${{ matrix.build-what.key == 'capi' }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: capi-linux-aarch64
path: dist
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.DS_Store
.idea
.gdb_history
/.cargo/
**/.vscode
api-docs-repo/
/.cargo_home/
Expand All @@ -17,6 +18,7 @@ wasmer.toml
# Generated by tests on Android
/avd
/core
/vendor
out.txt
wapm.toml
build-capi.tar.gz
Expand Down
Loading

0 comments on commit 1405d7f

Please sign in to comment.