The Unified and Autonomous Development Platform
Able to return singular value in param supply
Robin Shen6905151fe09f
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.javaindex 0f4a070348..a509477bb9 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java@@ -64,14 +64,22 @@ public class ScriptingValues implements ValuesProvider {variables.put("build", Build.get());variables.put("event", Event.get());List<List<String>> values = new ArrayList<>();- for (Object each: (List<Object>) GroovyUtils.evalScriptByName(scriptName, variables)) {- List<String> strings = new ArrayList<>();- if (each instanceof Collection) {- for (Object each2: (Collection<?>) each)- strings.add(each2.toString());- } else if (each != null) {- strings.add(each.toString());+ Object result = GroovyUtils.evalScriptByName(scriptName, variables);+ if (result instanceof List) {+ for (Object each: (List<Object>) result) {+ List<String> strings = new ArrayList<>();+ if (each instanceof Collection) {+ for (Object each2: (Collection<?>) each)+ strings.add(each2.toString());+ } else if (each != null) {+ strings.add(each.toString());+ }+ values.add(strings);}+ } else {+ List<String> strings = new ArrayList<>();+ if (result != null)+ strings.add(result.toString());values.add(strings);}return values;