From cc6832cf488f35d7c7d8b2778f40b16050840a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Wed, 9 Sep 2015 00:08:28 +0100 Subject: [PATCH] fix travis builds by forcing it to ubuntu 14.04 This (for now) will force Travis' hand to use ubuntu 14.04 which has mingw 4.8 available. It is enough to compile the project as it stands. --- .travis.yml | 3 +++ install.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 863be8d7cd..116b0b1198 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,3 +17,6 @@ cache: apt: true sudo: required + +services: + - docker diff --git a/install.sh b/install.sh index e834c27d66..93d64307f5 100755 --- a/install.sh +++ b/install.sh @@ -74,6 +74,7 @@ if [[ `uname` == "Darwin" ]]; then popd fi elif [[ `uname` == "Linux" ]]; then + sudo apt-get update if [[ -z "$TRAVIS" ]]; then sudo apt-get install -y binutils-mingw-w64-i686 gcc-mingw-w64-i686 g++-mingw-w64-i686 cmake if [[ -z "$DISABLE_G2_BUILD" ]]; then