Skip to content

Commit 6c36185

Browse files
committed
Merge branch 'master' into feature/merge-cranelift-0-44-0
2 parents 008a1d7 + 44e9086 commit 6c36185

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Blocks of changes will separated by version increments.
77
## **[Unreleased]**
88

99
- [#835](https://github.com/wasmerio/wasmer/pull/836) Update Cranelift fork version to `0.44.0`
10+
- [#839](https://github.com/wasmerio/wasmer/pull/839) Change supported version to stable Rust 1.37+
1011
- [#834](https://github.com/wasmerio/wasmer/pull/834) Fix panic when unwraping `wasmer` arguments
1112
- [#833](https://github.com/wasmerio/wasmer/pull/833) Add doc example of using ImportObject's new `maybe_with_namespace` method
1213
- [#832](https://github.com/wasmerio/wasmer/pull/832) Delete unused runtime ABI

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ nginx and Lua do not work on Windows - you can track the progress on [this issue
177177
</details>
178178

179179
## Building
180-
[![Rustc Version 1.36+](https://img.shields.io/badge/rustc-1.36+-red.svg?style=flat-square)](https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html)
180+
[![Rustc Version 1.37+](https://img.shields.io/badge/rustc-1.37+-red.svg?style=flat-square)](https://blog.rust-lang.org/2019/08/15/Rust-1.37.0.html)
181181

182182
Wasmer is built with [Cargo](https://crates.io/), the Rust package manager.
183183

azure-pipelines.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- script: cargo fmt --all -- --check
2323
displayName: Lint
2424
variables:
25-
rust_toolchain: stable
25+
rust_toolchain: '1.37.0'
2626

2727
- job: Test
2828
strategy:
@@ -39,7 +39,7 @@ jobs:
3939
CARGO_HTTP_CHECK_REVOKE: false
4040
windows:
4141
imageName: "vs2017-win2016"
42-
rust_toolchain: stable
42+
rust_toolchain: '1.37.0'
4343
pool:
4444
vmImage: $(imageName)
4545
condition: in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/staging', 'refs/heads/trying')
@@ -96,7 +96,7 @@ jobs:
9696
MACOSX_DEPLOYMENT_TARGET: 10.10
9797
windows:
9898
imageName: "vs2017-win2016"
99-
rust_toolchain: stable
99+
rust_toolchain: '1.37.0'
100100
# RUSTFLAGS: -Ctarget-feature=+crt-static
101101
pool:
102102
vmImage: $(imageName)
@@ -159,7 +159,7 @@ jobs:
159159
MACOSX_DEPLOYMENT_TARGET: 10.10
160160
windows:
161161
imageName: "vs2017-win2016"
162-
rust_toolchain: stable
162+
rust_toolchain: '1.37.0'
163163
# RUSTFLAGS: -Ctarget-feature=+crt-static
164164
pool:
165165
vmImage: $(imageName)

0 commit comments

Comments
 (0)