widelands

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

  1. appveyor_tuning
  2. Merge into trunk
Proposed by Tino
Status: Merged
Merged at revision: 8842
Proposed branch: lp:~widelands-dev/widelands/appveyor_tuning
Merge into: lp:widelands
Diff against target: 25 lines (+4/-4)
1 file modified
appveyor.yml (+4/-4)
To merge this branch: bzr merge lp:~widelands-dev/widelands/appveyor_tuning
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+355335@code.launchpad.net

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

Description of the change

This should allow parallel compiling, but disable parallel linking which always crashed with x64 debug builds due to excessive memory usage while linking.

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

LGTM :)

review: Approve
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4005. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/430516868.
Appveyor build 3802. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_tuning-3802.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

As everything is green

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'appveyor.yml'
2--- appveyor.yml 2018-09-08 16:37:11 +0000
3+++ appveyor.yml 2018-09-19 12:09:07 +0000
4@@ -4,6 +4,8 @@
5 # Appveyor build configuration #
6 ###################################
7
8+environment:
9+ appveyor_build_worker_cloud: gce
10 init:
11 - cmd: "IF \"%PLATFORM%\" == \"x86\" (set MINGWPATH=C:\\msys64\\mingw32\\bin& set MINGWSUFFIX=i686) ELSE (set MINGWPATH=C:\\msys64\\mingw64\\bin& set MINGWSUFFIX=x86_64)"
12
13@@ -32,10 +34,8 @@
14 - cmd: md build
15 - cmd: cd build
16 - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
17- - cmd: "cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=ON -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF %APPVEYOR_BUILD_FOLDER%"
18- # Appveyor does not provide enough memory to build/link thex64 debug build in parallel (Oct 2016)
19- # TODO(Tino): Optimize WL build scripts to use less memory/no cyclic dependencies
20- - cmd: "IF \"%PLATFORM%\" == \"x64\" (IF \"%CONFIGURATION%\" == \"Debug\" (ninja -j 1) ELSE (ninja)) ELSE (ninja)"
21+ - 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%"
22+ - cmd: "cmake --build ."
23 on_success:
24 - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe
25 - cmd: ISCC /q /o%APPVEYOR_BUILD_FOLDER% /fWidelands-%APPVEYOR_BUILD_VERSION%-%CONFIGURATION%-%PLATFORM% c:\projects\widelands\utils\win32\innosetup\Widelands.iss

Subscribers

People subscribed via source and target branches

to status/vote changes: