From 61ea25f61bd2ad4b59801c46978babe528e54130 Mon Sep 17 00:00:00 2001
From: Christian Legnitto <LegNeato@users.noreply.github.com>
Date: Tue, 2 Oct 2018 14:53:09 -0700
Subject: [PATCH] Use latest cargo make (#260)
---
.travis.yml | 11 +----------
juniper_warp/Makefile.toml | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 10 deletions(-)
create mode 100644 juniper_warp/Makefile.toml
diff --git a/.travis.yml b/.travis.yml
index a9b5ef93..0e7ccfdc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,17 +18,8 @@ env:
- CARGO_MAKE_RUN_CODECOV=true
script:
- - wget -O ~/.cargo/bin/cargo-make https://bintray.com/sagiegurari/cargo-make/download_file?file_path=cargo-make_v0.11.0u
- - chmod 777 ~/.cargo/bin/cargo-make
+ - cargo install --debug cargo-make -f
- cargo make workspace-ci-flow --no-workspace
- # The tests for juniper_warp need to run separately because warp has higher
- # minimum rust version requirements than juniper.
- #
- # There is a cargo-make issue about this problem: https://github.com/sagiegurari/cargo-make/issues/110
- #
- # We check for '1' because we the only channels we want to support are
- # "stable", "beta" and "nightly" (that will be the values of $TRAVIS_RUST_VERSION)
- - if ! [[ $TRAVIS_RUST_VERSION = *'1'* ]]; then cargo test --all --manifest-path=juniper_warp/Cargo.toml; fi
before_deploy:
- rm -rf target/package/
diff --git a/juniper_warp/Makefile.toml b/juniper_warp/Makefile.toml
new file mode 100644
index 00000000..79eb0c6f
--- /dev/null
+++ b/juniper_warp/Makefile.toml
@@ -0,0 +1,17 @@
+[tasks.build-verbose]
+condition = { rust_version = { min = "1.29.0" } }
+
+[tasks.build-verbose.windows]
+condition = { rust_version = { min = "1.29.0" }, env = { "TARGET" = "x86_64-pc-windows-msvc" } }
+
+[tasks.test-verbose]
+condition = { rust_version = { min = "1.29.0" } }
+
+[tasks.test-verbose.windows]
+ondition = { rust_version = { min = "1.29.0" }, env = { "TARGET" = "x86_64-pc-windows-msvc" } }
+
+[tasks.ci-coverage-flow]
+condition = { rust_version = { min = "1.29.0" } }
+
+[tasks.ci-coverage-flow.windows]
+disabled = true