gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Move Windows CI to the new autobuilder

Browse Source 
Make the new agent the default for Windows pipelines.

Refs #6977, which might be fixed in the new environment.
This commit is contained in:
Itms
2024-11-10 10:02:34 +01:00
committed by Nicolas Auvray
parent 581f4af012
commit 58e16c2057
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jenkins/pipelines/nightly-build.Jenkinsfile
+1 -1
View File
@@ -26,7 +26,7 @@ def buildSPIRV = false
pipeline {
agent {
node {
label 'WindowsAgentNew'
label 'WindowsAgent'
customWorkspace 'workspace/nightly-build'
}
}
build/jenkins/pipelines/windows.Jenkinsfile
+5 -5
View File
@@ -15,9 +15,9 @@
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
*/
// This pipeline builds the game on Windows (which uses the MSVC 15.0 compiler from Visual Studio 2017) and runs tests.
// This pipeline builds the game on Windows (with the MSVC 15.0 compiler) and runs tests.
def visualStudioPath = "\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\MSBuild\\15.0\\Bin\\MSBuild.exe\""
def visualStudioPath = "\"C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Current\\Bin\\MSBuild.exe\""
def buildOptions = "/p:PlatformToolset=v141_xp /p:XPDeprecationWarning=false /t:pyrogenesis /t:AtlasUI /t:test /m:2 /nologo -clp:NoSummary"
pipeline {
@@ -27,7 +27,7 @@ pipeline {
agent {
node {
label 'WindowsAgent'
customWorkspace 'workspace/vs2017'
customWorkspace 'workspace/win32-pch'
}
}
@@ -40,8 +40,8 @@ pipeline {
bat "git lfs pull -I \"binaries/data/mods/_test.*\""
bat "cd libraries && get-windows-libs.bat"
bat "(robocopy /MIR /NDL /NJH /NJS /NP /NS /NC C:\\wxwidgets3.0.4\\lib libraries\\win32\\wxwidgets\\lib) ^& IF %ERRORLEVEL% LEQ 1 exit 0"
bat "(robocopy /MIR /NDL /NJH /NJS /NP /NS /NC C:\\wxwidgets3.0.4\\include libraries\\win32\\wxwidgets\\include) ^& IF %ERRORLEVEL% LEQ 1 exit 0"
bat "(robocopy /MIR /NDL /NJH /NJS /NP /NS /NC E:\\wxWidgets-3.2.6\\lib libraries\\win32\\wxwidgets\\lib) ^& IF %ERRORLEVEL% LEQ 1 exit 0"
bat "(robocopy /MIR /NDL /NJH /NJS /NP /NS /NC E:\\wxWidgets-3.2.6\\include libraries\\win32\\wxwidgets\\include) ^& IF %ERRORLEVEL% LEQ 1 exit 0"
bat "cd build\\workspaces && update-workspaces.bat --atlas --jenkins-tests"
}
}