From 9ce42fd2e191ea8f4021b0b5aaea5bbe4cc89177 Mon Sep 17 00:00:00 2001
From: Vlad Frolov <frolvlad@gmail.com>
Date: Sun, 1 Oct 2023 17:33:58 +0200
Subject: [PATCH] ci: Temporarily ignore near-workspaces-rs tests as cargo-near
 requires Rust 1.70+ while latest released near-workspaces-rs does not support
 Rust 1.70+

---
 .gitattributes                         |  1 +
 .github/workflows/test.yml             | 13 ++-----------
 Cargo.toml                             |  1 +
 integration-tests/tests/build/embed.rs |  3 +++
 integration-tests/tests/build/mod.rs   |  3 +++
 integration-tests/tests/build/opts.rs  | 12 ++++++++++++
 6 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..9a0309f9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+Cargo.lock linguist-generated=true -diff
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a0b1a062..3e516a70 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -33,13 +33,6 @@ jobs:
         if: runner.os == 'Linux'
         run: sudo apt-get update && sudo apt-get install --assume-yes libudev-dev
 
-      - name: downgrade crates to support older Rust toolchain
-        if: matrix.toolchain == '1.69.0'
-        run: |
-          cargo update -p anstyle --precise 1.0.2
-          cargo update -p clap --precise 4.3.24
-          cargo update -p clap_lex --precise 0.5.0
-
       - name: Cargo check
         run: cargo check -p cargo-near
 
@@ -54,13 +47,11 @@ jobs:
       - name: Checkout Sources
         uses: actions/checkout@v2
 
-      # Remove this whole block once nearcore supports Rust 1.70.0+
-      # https://github.com/near/nearcore/issues/9143
-      - name: "Install 1.69.0 toolchain"
+      - name: "Install stable Rust toolchain"
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.69.0
+          toolchain: stable
           default: true
 
       - name: Install `wasm32-unknown-unknown`
diff --git a/Cargo.toml b/Cargo.toml
index 44efdd61..c2895f4c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "cargo-near",
     "integration-tests",
diff --git a/integration-tests/tests/build/embed.rs b/integration-tests/tests/build/embed.rs
index 15ad435a..293acf3e 100644
--- a/integration-tests/tests/build/embed.rs
+++ b/integration-tests/tests/build/embed.rs
@@ -4,6 +4,9 @@ use function_name::named;
 
 #[tokio::test]
 #[named]
+// TODO: remove ignore after near-workspaces-rs supports Rust 1.70+
+// https://github.com/near/cargo-near/issues/104
+#[ignore]
 async fn test_build_embed_abi() -> cargo_near::CliResult {
     let build_result = build_fn_with! {
         Opts: "--embed-abi";
diff --git a/integration-tests/tests/build/mod.rs b/integration-tests/tests/build/mod.rs
index 94bb3d1f..cf32e7d8 100644
--- a/integration-tests/tests/build/mod.rs
+++ b/integration-tests/tests/build/mod.rs
@@ -7,6 +7,9 @@ mod opts;
 
 #[tokio::test]
 #[named]
+// TODO: remove ignore after near-workspaces-rs supports Rust 1.70+
+// https://github.com/near/cargo-near/issues/104
+#[ignore]
 async fn test_build_simple() -> cargo_near::CliResult {
     let build_result = build_fn! {
         /// Adds `a` and `b`.
diff --git a/integration-tests/tests/build/opts.rs b/integration-tests/tests/build/opts.rs
index 70ff17c1..743c52da 100644
--- a/integration-tests/tests/build/opts.rs
+++ b/integration-tests/tests/build/opts.rs
@@ -66,6 +66,9 @@ fn test_build_opt_out_dir() -> cargo_near::CliResult {
 
 #[tokio::test]
 #[named]
+// TODO: remove ignore after near-workspaces-rs supports Rust 1.70+
+// https://github.com/near/cargo-near/issues/104
+#[ignore]
 async fn test_build_opt_release() -> cargo_near::CliResult {
     let build_result = build_fn_with! {
         Opts: "--release";
@@ -85,6 +88,9 @@ async fn test_build_opt_release() -> cargo_near::CliResult {
 
 #[tokio::test]
 #[named]
+// TODO: remove ignore after near-workspaces-rs supports Rust 1.70+
+// https://github.com/near/cargo-near/issues/104
+#[ignore]
 async fn test_build_opt_doc_embed() -> cargo_near::CliResult {
     let build_result = build_fn_with! {
         Opts: "--doc --embed-abi";
@@ -112,6 +118,9 @@ async fn test_build_opt_doc_embed() -> cargo_near::CliResult {
 
 #[test]
 #[named]
+// TODO: remove ignore after near-workspaces-rs supports Rust 1.70+
+// https://github.com/near/cargo-near/issues/104
+#[ignore]
 fn test_build_opt_no_abi_doc() -> cargo_near::CliResult {
     fn run_test() -> cargo_near::CliResult {
         build_fn_with! {
@@ -134,6 +143,9 @@ fn test_build_opt_no_abi_doc() -> cargo_near::CliResult {
 
 #[test]
 #[named]
+// TODO: remove ignore after near-workspaces-rs supports Rust 1.70+
+// https://github.com/near/cargo-near/issues/104
+#[ignore]
 fn test_build_opt_no_abi_embed() -> cargo_near::CliResult {
     fn run_test() -> cargo_near::CliResult {
         build_fn_with! {