Merge lp:~widelands-dev/widelands/travis-brew into lp:widelands

Proposed by Toni Förster
Status: Merged
Merged at revision: 8958
Proposed branch: lp:~widelands-dev/widelands/travis-brew
Merge into: lp:widelands
Diff against target: 12 lines (+2/-0)
1 file modified
.travis.sh (+2/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/travis-brew
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+361702@code.launchpad.net

Commit message

update homebrew before installing dependencies on osx

Description of the change

From the output on travis it seems as if there are some problems with updating homebrew.

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

Continuous integration builds have changed state:

Travis build 4394. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/478743768.
Appveyor build 4185. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_travis_brew-4185.

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

@bunnybot merge

Revision history for this message
kaputtnik (franku) wrote :

Many thanks :-)

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

You're very welcome :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.travis.sh'
--- .travis.sh 2018-12-24 10:43:43 +0000
+++ .travis.sh 2019-01-12 12:48:22 +0000
@@ -14,6 +14,8 @@
14fi14fi
1515
16if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then16if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
17 # Upgrade homebrew
18 brew update && brew upgrade
17 # Install osx dependencies19 # Install osx dependencies
18 # boost, cmake, gettext and icu4c are preinstalled :)20 # boost, cmake, gettext and icu4c are preinstalled :)
19 brew install glew sdl2 sdl2_image sdl2_mixer sdl2_ttf21 brew install glew sdl2 sdl2_image sdl2_mixer sdl2_ttf

Subscribers

People subscribed via source and target branches

to status/vote changes: