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

Proposed by Toni Förster
Status: Merged
Merged at revision: 8947
Proposed branch: lp:~widelands-dev/widelands/appveyor-boost-168
Merge into: lp:widelands
Diff against target: 26 lines (+6/-3)
1 file modified
appveyor.yml (+6/-3)
To merge this branch: bzr merge lp:~widelands-dev/widelands/appveyor-boost-168
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+361094@code.launchpad.net

Commit message

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

Description of the change

This is just a temporary fix until the underlying issue is resolved.

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

Continuous integration builds have changed state:

Travis build 4346. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/469689821.
Appveyor build 4140. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_boost_168-4140.

8945. By Toni Förster

merge trunk

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4352. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/470524367.
Appveyor build 4146. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_boost_168-4146.

8946. By Toni Förster

merge trunk

8947. By Toni Förster

Temporarly, disable x86 builds since they are failing.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4358. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/471166450.
Appveyor build 4152. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_appveyor_boost_168-4152.

Revision history for this message
Toni Förster (stonerl) wrote :

@bunnybot merge

Revision history for this message
GunChleoc (gunchleoc) wrote :

Do we have an open bug report for this? We should try to get x86 back before releasing Build 20.

Revision history for this message
Toni Förster (stonerl) wrote :

I think so, although it builds. Just the first to tests are failing:

The following tests FAILED:
   1 - test_economy (Exit code 0xc0000139
)
   2 - test_io_filesystem (Exit code 0xc0000139
)

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-12-04 12:13:49 +0000
3+++ appveyor.yml 2018-12-21 21:01:07 +0000
4@@ -21,8 +21,10 @@
5 - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
6 - cmd: "bash --login -c \"pacman -Suuyy --noconfirm\""
7 # Installed required libs
8- - 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\""
9-
10+ - 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\""
11+ # Download and install Boost 1.68 --since 1.69 breaks compiling
12+ # https://bugs.launchpad.net/widelands/+bug/1808481
13+ - 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\""
14 shallow_clone: true
15
16 branches:
17@@ -47,7 +49,8 @@
18
19 platform:
20 - x64
21- - x86
22+# Temporarly, disable x86 builds since they are failing.
23+# - x86
24
25 configuration:
26 - Release

Subscribers

People subscribed via source and target branches

to status/vote changes: