Skip to content

Commit 65093c7

Browse files
authored
Create platform specific run-elasticsearch task (#159)
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.
1 parent c2ad7d2 commit 65093c7

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Makefile.toml

+7-1
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,16 @@ dependencies = ["install-cargo2junit"]
8383

8484
[tasks.run-elasticsearch]
8585
category = "Elasticsearch"
86+
private = true
8687
condition = { env_set = [ "STACK_VERSION", "TEST_SUITE" ], env_false = ["CARGO_MAKE_CI"] }
87-
command = "./.ci/run-elasticsearch.sh"
8888
dependencies = ["set-oss-env", "set-xpack-env"]
8989

90+
[tasks.run-elasticsearch.linux]
91+
command = "./.ci/run-elasticsearch.sh"
92+
93+
[tasks.run-elasticsearch.mac]
94+
command = "./.ci/run-elasticsearch.sh"
95+
9096
[tasks.run-elasticsearch.windows]
9197
script_runner = "cmd"
9298
script = [

0 commit comments

Comments
 (0)