Skip to content

Commit

Permalink
Merge branch 'master' into ci_riscv64
Browse files Browse the repository at this point in the history
  • Loading branch information
ptitSeb committed Apr 14, 2023
2 parents 59c0933 + 61a3217 commit d16c2ca
Show file tree
Hide file tree
Showing 97 changed files with 32,843 additions and 641 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/---bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Copy and paste the result of executing the following in your shell, so we can kn
-->

```sh
echo "`wasmer -V` | `rustc -V` | `uname -m`"
wasmer -vV; rustc -vV
```


Expand Down
48 changes: 48 additions & 0 deletions .github/workflows/web.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
# Separate workflow for the wasmer-web crate.
#

# Automatically cancel previous workflow runs when a new commit is pushed.
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

name: Wasmer Web
on:
push:
branches:
- main
pull_request:
jobs:
web:
name: Build and Test (wasmer-web)
strategy:
matrix:
os: [ubuntu-latest]
rust: [nightly]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Install Rust
uses: actions/checkout@v3
with:
toolchain: ${{ matrix.rust }}

- name: Show Rust version
run: |
rustc --version
- name: Check formatting
shell: bash
run: |
cd lib/wasi-web
cargo fmt --check
- name: Check
continue-on-error: true
env:
CARGO_NET_GIT_FETCH_WITH_CLI: "true"
run: |
cd lib/wasi-web
cargo check
91 changes: 53 additions & 38 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ members = [
"tests/integration/ios",
"fuzz",
]
exclude = [
"lib/wasi-web",
]
resolver = "2"

[build-dependencies]
Expand Down
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,13 @@ check-capi:
build-wasmer:
$(CARGO_BINARY) build $(CARGO_TARGET_FLAG) --release --manifest-path lib/cli/Cargo.toml $(compiler_features) --features="webc_runner" --bin wasmer

install-wasi-web:
cd lib/wasi-web && npm install || true
cd lib/wasi-web && npm run build

build-wasi-web:
cd lib/wasi-web && npm run build

build-wasmer-debug:
$(CARGO_BINARY) build $(CARGO_TARGET_FLAG) --manifest-path lib/cli/Cargo.toml $(compiler_features) --features "webc_runner,debug" --bin wasmer

Expand Down
Loading

0 comments on commit d16c2ca

Please sign in to comment.