From 100625e317a1fb4cdb2052a8a6d3657097ee109a Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sat, 31 Jan 2015 22:24:31 -0600 Subject: only use the specific build matrix use sudo to install mingw toolchains --- .travis.yml | 10 ---------- scripts/travis | 8 +++++--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5c782bd..2fce9df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,4 @@ language: c -compiler: - - clang - - gcc -os: - - linux - - osx -env: - - ARCH=native - - ARCH=mingw32 - - ARCH=mingw64 matrix: include: - compiler: clang diff --git a/scripts/travis b/scripts/travis index 4d28782..e5497c6 100755 --- a/scripts/travis +++ b/scripts/travis @@ -16,9 +16,11 @@ else if [ -z $(which $CC) ]; then # Update Ubuntu 12.04 with current mingw toolchain - apt-get update && apt-get install -y python-software-properties - apt-add-repository -y ppa:tobydox/mingw-x-precise - apt-get update && apt-get install -y $ARCH-x-gcc make + sudo apt-get update + sudo apt-get install -y python-software-properties + sudo apt-add-repository -y ppa:tobydox/mingw-x-precise + sudo apt-get update + sudo apt-get install -y $ARCH-x-gcc make export PATH=$PATH:/opt/$ARCH/bin fi -- cgit v1.2.3-55-g6feb