Skip to content

Commit

Permalink
Merge #1691
Browse files Browse the repository at this point in the history
1691: Bump Rust CI version to 1.46.0 r=MarkMcCaskey a=MarkMcCaskey

Because 1.47.0 https://blog.rust-lang.org/2020/10/08/Rust-1.47.html released, we bump our minimum supported version to 1.46.0, maintaining 1 version behind latest stable.

# Review

- [ ] Add a short description of the the change to the CHANGELOG.md file


Co-authored-by: Mark McCaskey <[email protected]>
  • Loading branch information
bors[bot] and Mark McCaskey authored Oct 8, 2020
2 parents 2459d5d + 4a1f440 commit 6d2b55f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
include:
- build: linux
os: ubuntu-latest
rust: 1.45.0
rust: 1.46.0
env:
CARGO_SCCACHE_VERSION: 0.2.13
SCCACHE_AZURE_BLOB_CONTAINER: wasmerstoragesccacheblob
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.45.0
toolchain: 1.46.0
override: true
- name: Install LLVM (Linux)
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.45.0
toolchain: 1.46.0
override: true
components: rustfmt, clippy
- run: make lint
8 changes: 4 additions & 4 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,24 +42,24 @@ jobs:
include:
- build: linux
os: ubuntu-latest
rust: 1.45.2
rust: 1.46.0
llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz'
artifact_name: 'wasmer-linux-amd64'
run_integration_tests: true
- build: macos
os: macos-latest
rust: 1.45.2
rust: 1.46.0
llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-apple-darwin.tar.xz'
artifact_name: 'wasmer-macos-amd64'
run_integration_tests: true
- build: windows
os: windows-latest
rust: 1.45.2
rust: 1.46.0
artifact_name: 'wasmer-windows-amd64'
run_integration_tests: true
- build: linux-aarch64
os: [self-hosted, linux, ARM64]
rust: 1.45.2
rust: 1.46.0
llvm_url: 'https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-aarch64-linux-gnu.tar.xz'
artifact_name: 'wasmer-linux-aarch64'
run_integration_tests: false
Expand Down

0 comments on commit 6d2b55f

Please sign in to comment.