Skip to content

Commit

Permalink
Unfork all crates except for wasmi (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
jayz22 authored Jun 26, 2023
1 parent 1a2bc7f commit 3dc639f
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ jobs:
uses: stellar/actions/.github/workflows/rust-bump-version.yml@main
with:
version: ${{ inputs.version }}
base: soroban-wasmi-v0.16
base: soroban-wasmi-v0.30
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@

# Build all projects as if they are being published to crates.io, and do so for
# all feature and target combinations.
publish-dry-run-core:
cargo +stable publish --locked --dry-run --package soroban-wasmi_core

publish-dry-run-top:
cargo +stable publish --locked --dry-run --package soroban-wasmi

# Publish publishes the crate to crates.io. The dry-run is a dependency because
# the dry-run target will verify all feature set combinations.
publish-core: publish-dry-run-core
cargo +stable publish --locked --package soroban-wasmi_core

publish-top: publish-dry-run-top
cargo +stable publish --locked --package soroban-wasmi
1 change: 1 addition & 0 deletions crates/arena/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ readme.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true
publish = false

[features]
default = ["std"]
Expand Down
6 changes: 3 additions & 3 deletions crates/cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmi_cli"
version = "0.30.0-soroban"
version = "0.30.0"
documentation = "https://docs.rs/wasmi/"
description = "WebAssembly interpreter"
authors.workspace = true
Expand All @@ -15,8 +15,8 @@ publish = false
[dependencies]
anyhow = "1"
clap = { version = "4", features = ["derive"] }
wasmi = { package = "soroban-wasmi", path = "../wasmi" }
wasmi_wasi = { path = "../wasi" }
wasmi = { version = "0.30.0", git = "https://github.com/paritytech/wasmi.git" }
wasmi_wasi = { version = "0.30.0", git = "https://github.com/paritytech/wasmi.git" }
wat = "1"

[dev-dependencies]
Expand Down
8 changes: 5 additions & 3 deletions crates/core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
[package]
name = "soroban-wasmi_core"
version = "0.30.0-soroban"
description = "Soroban fork of Parity WebAssembly interpreter"
name = "wasmi_core"
version = "0.12.0"
documentation = "https://docs.rs/wasmi_core"
description = "Core primitives for the wasmi WebAssembly interpreter"
authors.workspace = true
repository.workspace = true
edition.workspace = true
readme.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true
publish = false

[dependencies]
libm = "0.2.1"
Expand Down
1 change: 0 additions & 1 deletion crates/core/src/host_error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use downcast_rs::{impl_downcast, DowncastSync};
/// # Examples
///
/// ```rust
/// use soroban_wasmi_core as wasmi_core;
/// use std::fmt;
/// use wasmi_core::{Trap, HostError};
///
Expand Down
4 changes: 2 additions & 2 deletions crates/wasi/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "wasmi_wasi"
version = "0.30.0-soroban"
version = "0.30.0"
documentation = "https://docs.rs/wasmi_wasi"
description = "WASI library support for the wasmi interpreter"
authors.workspace = true
Expand All @@ -16,7 +16,7 @@ publish = false
wasi-common = "2.0"
wasi-cap-std-sync = "2.0"
wiggle = { version = "2.0", default-features = false, features = ["wiggle_metadata"] }
wasmi = { package = "soroban-wasmi", path = "../wasmi" }
wasmi = { version = "0.30.0", git = "https://github.com/paritytech/wasmi.git" }

[dev-dependencies]
wat = "1.0.50"
Expand Down
2 changes: 1 addition & 1 deletion crates/wasmi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ categories.workspace = true

[dependencies]
wasmparser = { version = "0.100.1", package = "wasmparser-nostd", default-features = false }
wasmi_core = { package = "soroban-wasmi_core", version = "0.30.0-soroban", path = "../core", default-features = false }
wasmi_core = { version = "0.12", path = "../core", default-features = false }
wasmi_arena = { version = "0.4", path = "../arena", default-features = false }
spin = { version = "0.9", default-features = false, features = [
"mutex",
Expand Down

0 comments on commit 3dc639f

Please sign in to comment.