Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade to stable toolchain #293

Merged
merged 4 commits into from Sep 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest, macos-latest]
# TODO: Bring `stable` back to the matrix once Rust 1.70.0+ compatibility is resolved in nearcore:
# https://github.com/near/nearcore/issues/9143
toolchain: [1.69.0]
toolchain: [stable]

runs-on: ${{ matrix.platform }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

## Requirements

- Rust v1.69.0 and up (NOTE: [contracts compiled w/ 1.70+ will fail currently](https://github.com/near/nearcore/issues/9143))
- Rust v1.69.0 and up.
- MacOS (x86 and M1) or Linux (x86) for sandbox tests.

### WASM compilation not supported
Expand Down
4 changes: 3 additions & 1 deletion workspaces/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ fn main() {
let env_bin = std::env::var("NEAR_SANDBOX_BIN_PATH").is_ok();
if !doc_build && !env_bin && cfg!(feature = "install") {
// TODO Update commit to stable version once binaries are published correctly
near_sandbox_utils::install().expect("Could not install sandbox");
// Commit: https://github.com/near/nearcore/commit/eb2bbe1c3f51912c04462ce988aa496fab03d60e
near_sandbox_utils::install_with_version("master/eb2bbe1c3f51912c04462ce988aa496fab03d60e")
.expect("Could not install sandbox");
}
}