[Jenkinsfile] Get rid of unnecessary node and workspace allocations.
This commit is contained in:
parent
ff72493ce3
commit
b8fd01242a
26
Jenkinsfile
vendored
26
Jenkinsfile
vendored
@ -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.
|
||||||
|
Loading…
Reference in New Issue
Block a user