← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~widelands-dev/widelands/appveyor_tuning into lp:widelands

 

Tino has proposed merging lp:~widelands-dev/widelands/appveyor_tuning into lp:widelands.

Commit message:
Finetuning of Appveyor CI:
- explicitely request GCE image with 7,5GB RAM (vs. Hyper-V with 4GB)
- Set job pools for ninja via cmake

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor_tuning/+merge/355335

This should allow parallel compiling, but disable parallel linking which always crashed with x64 debug builds due to excessive memory usage while linking.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor_tuning into lp:widelands.
=== modified file 'appveyor.yml'
--- appveyor.yml	2018-09-08 16:37:11 +0000
+++ appveyor.yml	2018-09-19 12:09:07 +0000
@@ -4,6 +4,8 @@
 #   Appveyor build configuration  #
 ###################################
 
+environment:
+  appveyor_build_worker_cloud: gce
 init:
   - cmd: "IF \"%PLATFORM%\" == \"x86\" (set MINGWPATH=C:\\msys64\\mingw32\\bin& set MINGWSUFFIX=i686) ELSE (set MINGWPATH=C:\\msys64\\mingw64\\bin& set MINGWSUFFIX=x86_64)"
 
@@ -32,10 +34,8 @@
   - cmd: md build
   - cmd: cd build
   - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
-  - cmd: "cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF %APPVEYOR_BUILD_FOLDER%"
-  # Appveyor does not provide enough memory to build/link thex64 debug build in parallel (Oct 2016)
-  # TODO(Tino): Optimize WL build scripts to use less memory/no cyclic dependencies
-  - cmd: "IF \"%PLATFORM%\" == \"x64\" (IF \"%CONFIGURATION%\" == \"Debug\" (ninja -j 1) ELSE (ninja)) ELSE (ninja)"
+  - cmd: "cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%"
+  - cmd: "cmake --build ."
 on_success:
   - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
   - cmd: ISCC /q /o%APPVEYOR_BUILD_FOLDER% /fWidelands-%APPVEYOR_BUILD_VERSION%-%CONFIGURATION%-%PLATFORM% c:\projects\widelands\utils\win32\innosetup\Widelands.iss


Follow ups