From 23cf596748817c664bb3c4b352e83f34ce7e7f8a Mon Sep 17 00:00:00 2001 From: sagie gur ari Date: Wed, 6 Dec 2017 19:48:06 +0000 Subject: [PATCH] windows build --- Makefile.toml | 4 ---- appveyor.yml | 6 +----- juniper_rocket/Makefile.toml | 18 ++++++++++++++++++ juniper_tests/Makefile.toml | 6 ++++++ 4 files changed, 25 insertions(+), 9 deletions(-) delete mode 100644 Makefile.toml create mode 100644 juniper_rocket/Makefile.toml create mode 100644 juniper_tests/Makefile.toml diff --git a/Makefile.toml b/Makefile.toml deleted file mode 100644 index 559be3b7..00000000 --- a/Makefile.toml +++ /dev/null @@ -1,4 +0,0 @@ - -[tasks.init] -condition = { channels = ["beta", "stable"] } -env = { "CARGO_MAKE_WORKSPACE_SKIP_MEMBERS" = "juniper_rocket;juniper_tests" } diff --git a/appveyor.yml b/appveyor.yml index 8a47fe8c..06dbdf50 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,9 +37,5 @@ install: build: false test_script: - - cd juniper && cargo build --verbose && cargo test --verbose && cd .. - - cd juniper_codegen && cargo build --verbose && cargo test --verbose && cd .. - - cd juniper_tests && cargo build --verbose && cargo test --verbose && cd .. - - cd juniper_iron && cargo build --verbose && cargo test --verbose && cd .. - - IF NOT %TARGET% == %TARGET:msvc=% ( IF %CHANNEL% == "nightly" ( cd juniper_rocket && cargo test --verbose && cargo build --verbose && cd .. ) ) + - cargo make workspace-ci-flow --no-workspace diff --git a/juniper_rocket/Makefile.toml b/juniper_rocket/Makefile.toml new file mode 100644 index 00000000..fd86490c --- /dev/null +++ b/juniper_rocket/Makefile.toml @@ -0,0 +1,18 @@ + +[tasks.build-verbose] +condition = { channels = ["nightly"] } + +[tasks.build-verbose.windows] +condition = { channels = ["nightly"], env = { "TARGET" = "x86_64-pc-windows-msvc" } } + +[tasks.test-verbose] +condition = { channels = ["nightly"] } + +[tasks.test-verbose.windows] +condition = { channels = ["nightly"], env = { "TARGET" = "x86_64-pc-windows-msvc" } } + +[tasks.ci-coverage-flow] +condition = { channels = ["nightly"] } + +[tasks.ci-coverage-flow.windows] +disabled = true diff --git a/juniper_tests/Makefile.toml b/juniper_tests/Makefile.toml new file mode 100644 index 00000000..5283d340 --- /dev/null +++ b/juniper_tests/Makefile.toml @@ -0,0 +1,6 @@ + +[tasks.build-verbose] +args = ["build", "--verbose"] + +[tasks.test-verbose] +args = ["test", "--verbose"]