Skip to content

Commit aa357f7

Browse files
committed
Try fixing the ci
1 parent 8308213 commit aa357f7

File tree

4 files changed

+36
-12
lines changed

4 files changed

+36
-12
lines changed

.travis.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,8 @@ env:
1818
- CARGO_MAKE_RUN_CODECOV=true
1919

2020
script:
21-
- wget -O ~/.cargo/bin/cargo-make https://bintray.com/sagiegurari/cargo-make/download_file?file_path=cargo-make_v0.11.0u
22-
- chmod 777 ~/.cargo/bin/cargo-make
21+
- cargo install --debug cargo-make -f
2322
- cargo make workspace-ci-flow --no-workspace
24-
# The tests for juniper_warp need to run separately because warp has higher
25-
# minimum rust version requirements than juniper.
26-
#
27-
# There is a cargo-make issue about this problem: https://github.com/sagiegurari/cargo-make/issues/110
28-
#
29-
# We check for '1' because we the only channels we want to support are
30-
# "stable", "beta" and "nightly" (that will be the values of $TRAVIS_RUST_VERSION)
31-
- if ! [[ $TRAVIS_RUST_VERSION = *'1'* ]]; then cargo test --all --manifest-path=juniper_warp/Cargo.toml; fi
3223

3324
before_deploy:
3425
- rm -rf target/package/

juniper_rocket/Makefile.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
[tasks.build-verbose]
32
condition = { channels = ["nightly"] }
43

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

1716
[tasks.ci-coverage-flow.windows]
18-
disabled = true
17+
disabled = true

juniper_warp/Makefile.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[tasks.build-verbose]
2+
condition = { rust_version = { min = "1.29.0" } }
3+
4+
[tasks.build-verbose.windows]
5+
condition = { rust_version = { min = "1.29.0" }, env = { "TARGET" = "x86_64-pc-windows-msvc" } }
6+
7+
[tasks.test-verbose]
8+
condition = { rust_version = { min = "1.29.0" } }
9+
10+
[tasks.test-verbose.windows]
11+
condition = { rust_version = { min = "1.29.0" }, env = { "TARGET" = "x86_64-pc-windows-msvc" } }
12+
13+
[tasks.ci-coverage-flow]
14+
condition = { rust_version = { min = "1.29.0" } }
15+
16+
[tasks.ci-coverage-flow.windows]
17+
disabled = true
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[tasks.build-verbose]
2+
condition = { rust_version = { min = "1.29.0" } }
3+
4+
[tasks.build-verbose.windows]
5+
condition = { rust_version = { min = "1.29.0" }, env = { "TARGET" = "x86_64-pc-windows-msvc" } }
6+
7+
[tasks.test-verbose]
8+
condition = { rust_version = { min = "1.29.0" } }
9+
10+
[tasks.test-verbose.windows]
11+
condition = { rust_version = { min = "1.29.0" }, env = { "TARGET" = "x86_64-pc-windows-msvc" } }
12+
13+
[tasks.ci-coverage-flow]
14+
condition = { rust_version = { min = "1.29.0" } }
15+
16+
[tasks.ci-coverage-flow.windows]
17+
disabled = true

0 commit comments

Comments
 (0)