From a96508de768e3a6a6acad4b5dea2e985c0589f12 Mon Sep 17 00:00:00 2001 From: Yasir Shariff Date: Wed, 30 Aug 2023 21:33:37 +0300 Subject: [PATCH 1/4] upd: using stable toolchain --- .github/workflows/test.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3e0674e..308e83ff 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: From 75b73edc3f3a7b42299cbf05460b8a1a0bdca513 Mon Sep 17 00:00:00 2001 From: Yasir Shariff Date: Thu, 31 Aug 2023 12:36:09 +0300 Subject: [PATCH 2/4] upd: point to newer binary --- workspaces/build.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/workspaces/build.rs b/workspaces/build.rs index b3095292..f250a68e 100644 --- a/workspaces/build.rs +++ b/workspaces/build.rs @@ -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/dce4c514f60a7f7981f00290268af4faf7eec55c + near_sandbox_utils::install_with_version("master/eb2bbe1c3f51912c04462ce988aa496fab03d60e") + .expect("Could not install sandbox"); } } From 2879b317e66405a25e77de4ad755ec62540baeb8 Mon Sep 17 00:00:00 2001 From: Yasir Shariff Date: Thu, 31 Aug 2023 13:14:32 +0300 Subject: [PATCH 3/4] upd: docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52a8eeb6..ec3cc7cd 100644 --- a/README.md +++ b/README.md @@ -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 From 2f9d80c7f9d2844b8c9f19aaa302cbc395c21f65 Mon Sep 17 00:00:00 2001 From: Yasir Shariff Date: Thu, 31 Aug 2023 21:02:42 +0300 Subject: [PATCH 4/4] fix: commit hash comment --- workspaces/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workspaces/build.rs b/workspaces/build.rs index f250a68e..e2b6613a 100644 --- a/workspaces/build.rs +++ b/workspaces/build.rs @@ -5,7 +5,7 @@ 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 - // Commit: https://github.com/near/nearcore/commit/dce4c514f60a7f7981f00290268af4faf7eec55c + // Commit: https://github.com/near/nearcore/commit/eb2bbe1c3f51912c04462ce988aa496fab03d60e near_sandbox_utils::install_with_version("master/eb2bbe1c3f51912c04462ce988aa496fab03d60e") .expect("Could not install sandbox"); }