Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pipeline
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Andrew Nicols
pipeline
Commits
0c5dc6fd
Commit
0c5dc6fd
authored
Dec 18, 2017
by
Andrew Nicols
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Task: Get the correct env
parent
25cb8505
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
8 deletions
+6
-8
src/org/moodle/ci/Task.groovy
src/org/moodle/ci/Task.groovy
+5
-7
vars/runTask.groovy
vars/runTask.groovy
+1
-1
No files found.
src/org/moodle/ci/Task.groovy
View file @
0c5dc6fd
...
...
@@ -4,8 +4,6 @@ import org.moodle.ci.repositories.Repository
import
org.moodle.ci.versions.Version
class
Task
{
def
script
protected
Repository
repository
protected
Version
moodleVersion
...
...
@@ -66,7 +64,7 @@ class Task {
throw
new
Exception
(
"I don't know what PHP Version to test against"
)
}
def
getPathToRunner
()
{
def
getPathToRunner
(
env
)
{
def
runner
if
(
pathToRunner
)
{
runner
=
new
File
(
pathToRunner
)
...
...
@@ -76,9 +74,9 @@ class Task {
return
runner
.
getAbsolutePath
()
}
else
if
(
moodleVersion
)
{
runner
=
new
File
(
"${
script.
env.HOME}/scripts/runner/${moodleVersion.name}/run.sh"
)
runner
=
new
File
(
"${env.HOME}/scripts/runner/${moodleVersion.name}/run.sh"
)
if
(!
runner
.
exists
())
{
runner
=
new
File
(
"${
script.
env.HOME}/scripts/runner/master/run.sh"
)
runner
=
new
File
(
"${env.HOME}/scripts/runner/master/run.sh"
)
}
return
runner
.
getAbsolutePath
()
...
...
@@ -87,10 +85,10 @@ class Task {
script:
'grep "\\$branch" moodle/version.php | sed "s/^[^\']*\'\\([^\']*\\).*\$/\\1/"'
,
returnStdout:
true
).
trim
()
runner
=
new
File
(
"${
script.
env.HOME}/scripts/runner/${versionName}/run.sh"
)
runner
=
new
File
(
"${env.HOME}/scripts/runner/${versionName}/run.sh"
)
if
(!
runner
.
exists
())
{
runner
=
new
File
(
"${
script.
env.HOME}/scripts/runner/master/run.sh"
)
runner
=
new
File
(
"${env.HOME}/scripts/runner/master/run.sh"
)
}
return
runner
.
getAbsolutePath
()
...
...
vars/runTask.groovy
View file @
0c5dc6fd
...
...
@@ -50,7 +50,7 @@ def call(org.moodle.ci.Task task) {
stage
(
"Run Task"
)
{
steps
{
sh
task
.
pathToRunner
sh
task
.
getPathToRunner
(
env
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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