From b22a07f8f82dc5e57f0077e1f979a0dd861f0803 Mon Sep 17 00:00:00 2001 From: Russ Cam Date: Wed, 27 Jan 2021 11:04:03 +1000 Subject: [PATCH] Create platform specific run-elasticsearch task This commit splits out the command and script/script runner elements of the run-elasticsearch task to fix a bug when running on Windows where the task on linux and macOS uses a command whilst windows uses a script to run via WSL2. The Windows specific task ends up with multiple actions (command and script) which cargo make errors on. --- Makefile.toml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.toml b/Makefile.toml index 460989ab..e482a1ef 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -83,10 +83,16 @@ dependencies = ["install-cargo2junit"] [tasks.run-elasticsearch] category = "Elasticsearch" +private = true condition = { env_set = [ "STACK_VERSION", "TEST_SUITE" ], env_false = ["CARGO_MAKE_CI"] } -command = "./.ci/run-elasticsearch.sh" dependencies = ["set-oss-env", "set-xpack-env"] +[tasks.run-elasticsearch.linux] +command = "./.ci/run-elasticsearch.sh" + +[tasks.run-elasticsearch.mac] +command = "./.ci/run-elasticsearch.sh" + [tasks.run-elasticsearch.windows] script_runner = "cmd" script = [