Skip to content

Commit

Permalink
Try fixing the ci
Browse files Browse the repository at this point in the history
  • Loading branch information
weiznich committed Sep 25, 2018
1 parent 8308213 commit aa357f7
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 12 deletions.
11 changes: 1 addition & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
3 changes: 1 addition & 2 deletions juniper_rocket/Makefile.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

[tasks.build-verbose]
condition = { channels = ["nightly"] }

Expand All @@ -15,4 +14,4 @@ condition = { channels = ["nightly"], env = { "TARGET" = "x86_64-pc-windows-msvc
condition = { channels = ["nightly"] }

[tasks.ci-coverage-flow.windows]
disabled = true
disabled = true
17 changes: 17 additions & 0 deletions juniper_warp/Makefile.toml
Original file line number Diff line number Diff line change
@@ -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]
condition = { 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
17 changes: 17 additions & 0 deletions juniper_warp/examples/warp_server/Makefile.toml
Original file line number Diff line number Diff line change
@@ -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]
condition = { 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

0 comments on commit aa357f7

Please sign in to comment.