← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands

 

Toni Förster has proposed merging lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands.

Commit message:
since boost 1.69 breaks compiling use 1.68 to unbreak compiling on appveyor.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1808481 in widelands: "Boost 1.69 breaks compiling"
  https://bugs.launchpad.net/widelands/+bug/1808481

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/appveyor-boost-168/+merge/361094

This is just a temporary fix until the underlying issue is resolved.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/appveyor-boost-168 into lp:widelands.
=== modified file 'appveyor.yml'
--- appveyor.yml	2018-12-04 12:13:49 +0000
+++ appveyor.yml	2018-12-18 19:48:14 +0000
@@ -21,8 +21,10 @@
   - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
   - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
   # Installed required libs
-  - 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 mingw-w64-%MINGWSUFFIX%-glbinding\""
-
+  - cmd: "bash --login -c \"pacman --noconfirm -S mingw-w64-%MINGWSUFFIX%-ninja mingw-w64-%MINGWSUFFIX%-wget mingw-w64-%MINGWSUFFIX%-SDL2_ttf mingw-w64-%MINGWSUFFIX%-SDL2_mixer mingw-w64-%MINGWSUFFIX%-SDL2_image mingw-w64-%MINGWSUFFIX%-glbinding\""
+  # Download and install Boost 1.68 --since 1.69 breaks compiling
+  # https://bugs.launchpad.net/widelands/+bug/1808481
+  - cmd: "bash --login -c \"wget http://repo.msys2.org/mingw/%MINGWSUFFIX%/mingw-w64-%MINGWSUFFIX%-boost-1.68.0-2-any.pkg.tar.xz && pacman --noconfirm -U mingw-w64-%MINGWSUFFIX%-boost-1.68.0-2-any.pkg.tar.xz\""
 shallow_clone: true
 
 branches:


Follow ups