Merge lp:~widelands-dev/widelands/appveyorboost1.70 into lp:widelands

Proposed by hessenfarmer
Status: Merged
Merged at revision: 9084
Proposed branch: lp:~widelands-dev/widelands/appveyorboost1.70
Merge into: lp:widelands
Diff against target: 21 lines (+2/-2)
1 file modified
appveyor.yml (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/appveyorboost1.70
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+366498@code.launchpad.net

Commit message

Switched of the Boost cmake config file parsing cause they seem to be erroneous for boost 1.70.0

Description of the change

tried this variable in my own msys2 environment.
see if it works here as well

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

Continuous integration builds have changed state:

Travis build 4796. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/524351985.
Appveyor build 4577. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyorboost1_70-4577.

9080. By hessenfarmer

It's not a system variable but a cmake cache variable

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4803. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/524556934.
Appveyor build 4584. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyorboost1_70-4584.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Yep, that fixed it!

Travis failure is codecheck problem from trunk

@bunnybot merge force

review: Approve

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 2019-04-18 17:05:00 +0000
3+++ appveyor.yml 2019-04-25 15:50:04 +0000
4@@ -24,7 +24,7 @@
5 - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-boost mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image\""
6 - cmd: "IF \"%PLATFORM%\" == \"x86\" (bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-glew\") ELSE (bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-glbinding\")"
7 # CMake can't find Boost 1.70 yet, so we have to downgrade
8- - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/%MINGWSUFFIX%/mingw-w64-%MINGWSUFFIX%-boost-1.69.0-2-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-%MINGWSUFFIX%-boost-1.69.0-2-any.pkg.tar.xz\""
9+ # - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/%MINGWSUFFIX%/mingw-w64-%MINGWSUFFIX%-boost-1.69.0-2-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-%MINGWSUFFIX%-boost-1.69.0-2-any.pkg.tar.xz\""
10
11 shallow_clone: true
12
13@@ -39,7 +39,7 @@
14 - cmd: md build
15 - cmd: cd build
16 - cmd: echo %APPVEYOR_BUILD_VERSION%_%CONFIGURATION%_%PLATFORM% > %APPVEYOR_BUILD_FOLDER%\WL_RELEASE
17- - cmd: "IF \"%PLATFORM%\" == \"x86\" (cmake -G \"Ninja\" -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%) ELSE (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%)"
18+ - cmd: "IF \"%PLATFORM%\" == \"x86\" (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DOPTION_USE_GLBINDING=OFF -DOPTION_BUILD_WEBSITE_TOOLS=OFF -DOPTION_ASAN=OFF -DCMAKE_JOB_POOLS=\"linking=1\" -DCMAKE_JOB_POOL_LINK=linking %APPVEYOR_BUILD_FOLDER%) ELSE (cmake -G \"Ninja\" -DBoost_NO_BOOST_CMAKE=ON -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%)"
19 - cmd: "cmake --build ."
20 on_success:
21 - cmd: strip -sv %APPVEYOR_BUILD_FOLDER%\build\src\widelands.exe

Subscribers

People subscribed via source and target branches

to status/vote changes: