From b8fd01242a4166d9af1e57a38a381ba8e9cbf64b Mon Sep 17 00:00:00 2001 From: /dev/urandom Date: Tue, 3 Jan 2017 23:23:30 +0100 Subject: [PATCH] [Jenkinsfile] Get rid of unnecessary node and workspace allocations. --- Jenkinsfile | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68c0e01a..a80338aa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -98,22 +98,18 @@ def getIW4xExecutable() { // This will build the IW4x client. // We need a Windows Server with Visual Studio 2015, Premake5 and Git on it. def doBuild(cfg) { - node("windows") { - jobWorkspace(cfg.WorkspaceID) { - 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" - } + 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" } // This will run the unit tests for IW4x. @@ -305,4 +301,4 @@ gitlabBuilds(builds: ["Checkout & Versioning", "Build", "Testing", "Archiving"]) } } } -} \ No newline at end of file +}