Skip to content

Commit

Permalink
Merge branch 'master' into dd/sails-gprimitives
Browse files Browse the repository at this point in the history
  • Loading branch information
DennisInSky committed May 23, 2024
2 parents 413e6f0 + fbe22b4 commit 87d91d3
Show file tree
Hide file tree
Showing 56 changed files with 947 additions and 208 deletions.
2 changes: 2 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[target.x86_64-pc-windows-msvc]
rustflags = ["-Clink-arg=/force:unresolved", "-Ctarget-feature=+crt-static"]
6 changes: 4 additions & 2 deletions .github/workflows/ci-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,16 @@ jobs:

- name: "Prepare: build rmrk"
run: |
cargo build --manifest-path=examples/rmrk/catalog/wasm/Cargo.toml
cargo build --manifest-path=examples/rmrk/resource/wasm/Cargo.toml
cargo build --manifest-path=examples/rmrk/catalog/wasm/Cargo.toml --release
cargo build --manifest-path=examples/rmrk/resource/wasm/Cargo.toml --release
cargo build --manifest-path=examples/ping/wasm/Cargo.toml --release
- name: "Prepare: build rmrk client lib"
working-directory: js
run: |
node lib/app.js generate ../examples/rmrk/catalog/wasm/rmrk-catalog.idl -o ./test/rmrk-catalog
node lib/app.js generate ../examples/rmrk/resource/wasm/rmrk-resource.idl -o ./test/rmrk-resource
node lib/app.js generate ../examples/ping/wasm/ping.idl -o ./test/ping
- name: "Prepare: download Gear node"
run: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
js/lib/
js/parser.wasm
js/test/rmrk-*/
js/test/ping/

node_modules/
target/
Expand Down
Loading

0 comments on commit 87d91d3

Please sign in to comment.