From 97e6691c763c89e1a011cb8d0b436442c7118318 Mon Sep 17 00:00:00 2001 From: Itms Date: Tue, 27 Aug 2024 21:38:37 +0200 Subject: [PATCH] Fix Atlas in the nightly build The Windows autobuilder contains two built versions of wxWidgets. One corresponds to the oldest supported version of the library, and is used for CI. However, the nightly build should use a recent version of the library, compiled with the same toolset as the main game. This commit adapts the nightly-build pipeline to use the rebuilt recent copy of wxWidgets. --- build/jenkins/pipelines/nightly-build.Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/jenkins/pipelines/nightly-build.Jenkinsfile b/build/jenkins/pipelines/nightly-build.Jenkinsfile index 7a3a3c2187..5e2b235414 100644 --- a/build/jenkins/pipelines/nightly-build.Jenkinsfile +++ b/build/jenkins/pipelines/nightly-build.Jenkinsfile @@ -63,8 +63,8 @@ pipeline { stage ("Pre-build") { steps { bat "cd libraries && get-windows-libs.bat" - bat "(robocopy C:\\wxwidgets3.0.4\\lib libraries\\win32\\wxwidgets\\lib /MIR /NDL /NJH /NJS /NP /NS /NC) ^& IF %ERRORLEVEL% LEQ 1 exit 0" - bat "(robocopy C:\\wxwidgets3.0.4\\include libraries\\win32\\wxwidgets\\include /MIR /NDL /NJH /NJS /NP /NS /NC) ^& IF %ERRORLEVEL% LEQ 1 exit 0" + bat "(robocopy C:\\wxwidgets3.2.5\\lib libraries\\win32\\wxwidgets\\lib /MIR /NDL /NJH /NJS /NP /NS /NC) ^& IF %ERRORLEVEL% LEQ 1 exit 0" + bat "(robocopy C:\\wxwidgets3.2.5\\include libraries\\win32\\wxwidgets\\include /MIR /NDL /NJH /NJS /NP /NS /NC) ^& IF %ERRORLEVEL% LEQ 1 exit 0" bat "cd build\\workspaces && update-workspaces.bat --atlas --without-pch --without-tests" } }