Merge branch 'jenkins' into develop

This commit is contained in:
/dev/urandom 2017-01-04 17:53:54 +01:00
commit 77858938bd
No known key found for this signature in database
GPG Key ID: 41322B973E0F295E

4
Jenkinsfile vendored
View File

@ -98,8 +98,6 @@ def getIW4xExecutable() {
// This will build the IW4x client. // This will build the IW4x client.
// We need a Windows Server with Visual Studio 2015, Premake5 and Git on it. // We need a Windows Server with Visual Studio 2015, Premake5 and Git on it.
def doBuild(cfg) { def doBuild(cfg) {
node("windows") {
jobWorkspace(cfg.WorkspaceID) {
retry(5) { retry(5) {
checkout scm checkout scm
} }
@ -113,8 +111,6 @@ def doBuild(cfg) {
stash name: "${cfg.StashName}", includes: "*.dll,*.pdb" stash name: "${cfg.StashName}", includes: "*.dll,*.pdb"
} }
}
}
// This will run the unit tests for IW4x. // This will run the unit tests for IW4x.
// We need a Windows Server with MW2 on it. // We need a Windows Server with MW2 on it.