Commit 3cf3d148 authored by Andrew Nicols's avatar Andrew Nicols

Task: More runner path improvements

parent 0792b7ba
......@@ -74,9 +74,9 @@ class Task {
return pathToRunner
} else if (moodleVersion) {
runner = "${script.env.PATHTORUNNER}/${moodleVersion.name}/run.sh"
runner = "${script.env.HOME}/scripts/runner/${moodleVersion.name}/run.sh"
if (!fileExists(runner)) {
runner = "${script.env.PATHTORUNNER}/master/run.sh"
runner = "${script.env.HOME}/scripts/runner/master/run.sh"
}
return runner
......@@ -85,11 +85,13 @@ class Task {
script: 'grep "\\$branch" moodle/version.php | sed "s/^[^\']*\'\\([^\']*\\).*\$/\\1/"',
returnStdout: true
).trim()
runner = "${script.env.PATHTORUNNER}/${versionName}/run.sh"
runner = "${script.env.HOME}/scripts/runner/${versionName}/run.sh"
if (!fileExists(runner)) {
runner = "${script.env.PATHTORUNNER}/master/run.sh"
runner = "${script.env.HOME}/scripts/runner/master/run.sh"
}
return runner
}
throw new Exception("Unable to determine path to script runner. Either a moodleVersion or a pathToRunner must be provided")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment