Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'jenkins' into develop

Browse Source
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
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Jenkinsfile vendored
View File

@ -98,22 +98,18 @@ 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") { retry(5) {
jobWorkspace(cfg.WorkspaceID) { checkout scm
retry(5) {
checkout scm
}
useShippedPremake {
def outputDir = pwd()
def msbuild = tool "Microsoft.NET MSBuild 14.0"
bat "premake5 vs2015 ${cfg.PremakeArgs}"
bat "\"${msbuild}\" build\\iw4x.sln \"/p:OutDir=$outputDir\\\\\" \"/p:Configuration=${cfg.MSBuildConfiguration}\""
}
stash name: "${cfg.StashName}", includes: "*.dll,*.pdb"
}
} }
useShippedPremake {
def outputDir = pwd()
def msbuild = tool "Microsoft.NET MSBuild 14.0"
bat "premake5 vs2015 ${cfg.PremakeArgs}"
bat "\"${msbuild}\" build\\iw4x.sln \"/p:OutDir=$outputDir\\\\\" \"/p:Configuration=${cfg.MSBuildConfiguration}\""
}
stash name: "${cfg.StashName}", includes: "*.dll,*.pdb"
} }
// This will run the unit tests for IW4x. // This will run the unit tests for IW4x.
@ -305,4 +301,4 @@ gitlabBuilds(builds: ["Checkout & Versioning", "Build", "Testing", "Archiving"])
} }
} }
} }
} }