From 1058dda197a086600e286060f9df02256ee2cdcd Mon Sep 17 00:00:00 2001 From: Andrea Selva Date: Thu, 10 Jun 2021 10:31:39 +0200 Subject: [PATCH] Fix acceptance test when run artifact:all (#12975) This commit avoid to check for existence of jar files to decide if run or not Gradle assemble, basically because the outputs of assemble task are not only jars but also others files, for example plugin-aliases.yml. In this way the decision to execute or not is left the Gradle logic. (cherry picked from commit 3eaff3612d633f3f832a98ab654d906ce0aef39a) --- rakelib/compile.rake | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/rakelib/compile.rake b/rakelib/compile.rake index f06833d31c..2a538a1e10 100644 --- a/rakelib/compile.rake +++ b/rakelib/compile.rake @@ -29,18 +29,9 @@ namespace "compile" do logstash-core/lib/logstash/compiler/lscl/lscl_grammar.rb ) - def safe_system(*args) - if !system(*args) - status = $? - raise "Got exit status #{status.exitstatus} attempting to execute #{args.inspect}!" - end - end - task "logstash-core-java" do - unless File.exists?(File.join("logstash-core", "lib", "jars", "logstash-core.jar")) - puts("Building logstash-core using gradle") - safe_system("./gradlew", "assemble") - end + puts("Building logstash-core using gradle") + sh("./gradlew assemble") end desc "Build everything"