Skip to content

Commit 610c5bf

Browse files
authored
Merge branch 'master' into ctx-drop-finalizer
2 parents c3ced14 + 05be423 commit 610c5bf

File tree

24 files changed

+135
-132
lines changed

24 files changed

+135
-132
lines changed

.appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ build_script:
5858
- cd wapm-cli
5959
- rename wapm-cli-target target
6060
- cd ..
61-
- cargo build --release --manifest-path wapm-cli/Cargo.toml --features telemetry
61+
- cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications"
6262
- cd wapm-cli
6363
- cd ..
6464
- xcopy wapm-cli\target wapm-cli-target\ /i /y

.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ jobs:
226226
command: |
227227
export LLVM_SYS_70_PREFIX="`pwd`/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04/"
228228
make release
229-
cargo build --release --manifest-path wapm-cli/Cargo.toml --features telemetry
229+
cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications"
230230
mkdir -p artifacts
231231
VERSION=$(cargo pkgid | cut -d# -f2 | cut -d: -f2)
232232
# GIT_VERSION=$(git describe --exact-match --tags)
@@ -301,7 +301,7 @@ jobs:
301301
export PATH="$HOME/.cargo/bin:$PATH"
302302
export LLVM_SYS_70_PREFIX="`pwd`/clang+llvm-7.0.0-x86_64-apple-darwin/"
303303
make release
304-
cargo build --release --manifest-path wapm-cli/Cargo.toml --features telemetry
304+
cargo build --release --manifest-path wapm-cli/Cargo.toml --features "telemetry update-notifications"
305305
mkdir -p artifacts
306306
make build-install
307307
cp ./wasmer.tar.gz ./artifacts/$(./binary-name.sh)

CHANGELOG.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@ All PRs to the Wasmer repository must add to this file.
55
Blocks of changes will separated by version increments.
66

77
## **[Unreleased]**
8+
9+
## 0.5.7
10+
- [#575](https://github.com/wasmerio/wasmer/pull/575) Prepare for release; update wapm to 0.3.6
811
- [#555](https://github.com/wasmerio/wasmer/pull/555) WASI filesystem rewrite. Major improvements
912
- adds virtual root showing all preopened directories
1013
- improved sandboxing and code-reuse
1114
- symlinks work in a lot more situations
12-
- many various improvements to most syscalls touching the filesystem
15+
- many misc. improvements to most syscalls touching the filesystem
1316

1417
## 0.5.6
1518
- [#565](https://github.com/wasmerio/wasmer/pull/565) Update wapm and bump version to 0.5.6

Cargo.lock

+60-60
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "wasmer"
3-
version = "0.5.6"
3+
version = "0.5.7"
44
authors = ["The Wasmer Engineering Team <[email protected]>"]
55
edition = "2018"
66
repository = "https://github.com/wasmerio/wasmer"

bors.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ status = [
66
"continuous-integration/appveyor/branch"
77
]
88
required_approvals = 1
9-
timeout_sec = 900
9+
timeout_sec = 7200
1010
delete_merged_branches = true

lib/clif-backend/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[package]
22
name = "wasmer-clif-backend"
3-
version = "0.5.6"
3+
version = "0.5.7"
44
description = "Wasmer runtime Cranelift compiler backend"
55
license = "MIT"
66
authors = ["The Wasmer Engineering Team <[email protected]>"]
77
repository = "https://github.com/wasmerio/wasmer"
88
edition = "2018"
99

1010
[dependencies]
11-
wasmer-runtime-core = { path = "../runtime-core", version = "0.5.6" }
11+
wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" }
1212
cranelift-native = { version = "0.31" }
1313
cranelift-codegen = { version = "0.31" }
1414
cranelift-entity = { version = "0.31" }
@@ -34,7 +34,7 @@ version = "0.0.7"
3434

3535
[target.'cfg(windows)'.dependencies]
3636
winapi = { version = "0.3", features = ["errhandlingapi", "minwindef", "minwinbase", "winnt"] }
37-
wasmer-win-exception-handler = { path = "../win-exception-handler", version = "0.5.6" }
37+
wasmer-win-exception-handler = { path = "../win-exception-handler", version = "0.5.7" }
3838

3939
[features]
4040
debug = ["wasmer-runtime-core/debug"]

lib/dev-utils/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "wasmer-dev-utils"
3-
version = "0.5.6"
3+
version = "0.5.7"
44
description = "Wasmer runtime core library"
55
license = "MIT"
66
authors = ["The Wasmer Engineering Team <[email protected]>"]

lib/emscripten-tests/Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "wasmer-emscripten-tests"
3-
version = "0.5.6"
3+
version = "0.5.7"
44
description = "Tests for our Emscripten implementation"
55
license = "MIT"
66
authors = ["The Wasmer Engineering Team <[email protected]>"]
@@ -9,15 +9,15 @@ publish = false
99
build = "build/mod.rs"
1010

1111
[dependencies]
12-
wasmer-emscripten = { path = "../emscripten", version = "0.5.6" }
13-
wasmer-runtime-core = { path = "../runtime-core", version = "0.5.6" }
14-
wasmer-clif-backend = { path = "../clif-backend", version = "0.5.6" }
15-
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.6", optional = true }
16-
wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.6", optional = true }
12+
wasmer-emscripten = { path = "../emscripten", version = "0.5.7" }
13+
wasmer-runtime-core = { path = "../runtime-core", version = "0.5.7" }
14+
wasmer-clif-backend = { path = "../clif-backend", version = "0.5.7" }
15+
wasmer-llvm-backend = { path = "../llvm-backend", version = "0.5.7", optional = true }
16+
wasmer-singlepass-backend = { path = "../singlepass-backend", version = "0.5.7", optional = true }
1717

1818
[dev-dependencies]
1919
wabt = "0.7.2"
20-
wasmer-dev-utils = { path = "../dev-utils", version = "0.5.6"}
20+
wasmer-dev-utils = { path = "../dev-utils", version = "0.5.7"}
2121

2222
[build-dependencies]
2323
glob = "0.2.11"

0 commit comments

Comments
 (0)