Fix Jenkinsfile.
This commit is contained in:
parent
5c15ae5163
commit
976bf8d56d
12
Jenkinsfile
vendored
12
Jenkinsfile
vendored
@ -85,7 +85,7 @@ def getIW4xExecutable() {
|
|||||||
$class: 'CopyArtifact',
|
$class: 'CopyArtifact',
|
||||||
filter: '*',
|
filter: '*',
|
||||||
fingerprintArtifacts: true,
|
fingerprintArtifacts: true,
|
||||||
projectName: 'iw4x/iw4x-executable/' + iw4xExecutableBranch,
|
projectName: 'iw4x/iw4x-executable/' + iw4xExecutableBranch(),
|
||||||
selector: [
|
selector: [
|
||||||
$class: 'TriggeredBuildSelector',
|
$class: 'TriggeredBuildSelector',
|
||||||
allowUpstreamDependencies: false,
|
allowUpstreamDependencies: false,
|
||||||
@ -170,12 +170,20 @@ def doUnitTests(name) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Returns the IW4x executable branch to use
|
||||||
|
def iw4xExecutableBranch() {
|
||||||
|
try {
|
||||||
|
return IW4X_EXECUTABLE_BRANCH;
|
||||||
|
} catch(MissingPropertyException) {
|
||||||
|
return "master";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Job properties
|
// Job properties
|
||||||
properties([
|
properties([
|
||||||
[$class: "GitLabConnectionProperty", gitLabConnection: "sr0"]
|
[$class: "GitLabConnectionProperty", gitLabConnection: "sr0"]
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
||||||
gitlabBuilds(builds: ["Checkout & Versioning", "Build", "Testing", "Archiving"]) {
|
gitlabBuilds(builds: ["Checkout & Versioning", "Build", "Testing", "Archiving"]) {
|
||||||
// First though let's give this build a proper name
|
// First though let's give this build a proper name
|
||||||
stage("Checkout & Versioning") {
|
stage("Checkout & Versioning") {
|
||||||
|
Loading…
Reference in New Issue
Block a user