Skip to content

Commit

Permalink
ci: Temporarily ignore near-workspaces-rs tests as cargo-near require…
Browse files Browse the repository at this point in the history
…s Rust 1.70+ while latest released near-workspaces-rs does not support Rust 1.70+
  • Loading branch information
frol committed Oct 1, 2023
1 parent 1631c3e commit 9ce42fd
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Cargo.lock linguist-generated=true -diff
13 changes: 2 additions & 11 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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`
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[workspace]
resolver = "2"
members = [
"cargo-near",
"integration-tests",
Expand Down
3 changes: 3 additions & 0 deletions integration-tests/tests/build/embed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
3 changes: 3 additions & 0 deletions integration-tests/tests/build/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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`.
Expand Down
12 changes: 12 additions & 0 deletions integration-tests/tests/build/opts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";
Expand Down Expand Up @@ -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! {
Expand All @@ -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! {
Expand Down

0 comments on commit 9ce42fd

Please sign in to comment.