Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Andrew Lyons
pipeline
Commits
3cf3d148
Commit
3cf3d148
authored
Dec 17, 2017
by
Andrew Nicols
Browse files
Task: More runner path improvements
parent
0792b7ba
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/org/moodle/ci/Task.groovy
View file @
3cf3d148
...
...
@@ -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"
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment