Commit 0792b7ba authored by Andrew Nicols's avatar Andrew Nicols
Browse files

Task: Get better at guessing the pathToRunner

parent be34b4d3
......@@ -4,6 +4,8 @@ import org.moodle.ci.repositories.Repository
import org.moodle.ci.versions.Version
class Task {
def script
protected Repository repository
protected Version moodleVersion
......@@ -72,12 +74,22 @@ class Task {
return pathToRunner
} else if (moodleVersion) {
runner = "${env.PATHTORUNNER}/${moodleVersion.name}/run.sh"
runner = "${script.env.PATHTORUNNER}/${moodleVersion.name}/run.sh"
if (!fileExists(runner)) {
runner = "${env.PATHTORUNNER}/master/run.sh"
runner = "${script.env.PATHTORUNNER}/master/run.sh"
}
return runner
} else {
versionName = sh (
script: 'grep "\\$branch" moodle/version.php | sed "s/^[^\']*\'\\([^\']*\\).*\$/\\1/"',
returnStdout: true
).trim()
runner = "${script.env.PATHTORUNNER}/${versionName}/run.sh"
if (!fileExists(runner)) {
runner = "${script.env.PATHTORUNNER}/master/run.sh"
}
}
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