aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2015-01-31 22:24:31 -0600
committerBrent Cook <bcook@openbsd.org>2015-01-31 22:24:31 -0600
commit100625e317a1fb4cdb2052a8a6d3657097ee109a (patch)
tree6dcc6f7121482458454bcfeac711da0d4bfd25e0
parent5ea47a8fa209499349d58e3b7d4f74e0f49cf7c3 (diff)
downloadportable-100625e317a1fb4cdb2052a8a6d3657097ee109a.tar.gz
portable-100625e317a1fb4cdb2052a8a6d3657097ee109a.tar.bz2
portable-100625e317a1fb4cdb2052a8a6d3657097ee109a.zip
only use the specific build matrix
use sudo to install mingw toolchains
-rw-r--r--.travis.yml10
-rwxr-xr-xscripts/travis8
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 @@
1language: c 1language: c
2compiler:
3 - clang
4 - gcc
5os:
6 - linux
7 - osx
8env:
9 - ARCH=native
10 - ARCH=mingw32
11 - ARCH=mingw64
12matrix: 2matrix:
13 include: 3 include:
14 - compiler: clang 4 - 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
16 16
17 if [ -z $(which $CC) ]; then 17 if [ -z $(which $CC) ]; then
18 # Update Ubuntu 12.04 with current mingw toolchain 18 # Update Ubuntu 12.04 with current mingw toolchain
19 apt-get update && apt-get install -y python-software-properties 19 sudo apt-get update
20 apt-add-repository -y ppa:tobydox/mingw-x-precise 20 sudo apt-get install -y python-software-properties
21 apt-get update && apt-get install -y $ARCH-x-gcc make 21 sudo apt-add-repository -y ppa:tobydox/mingw-x-precise
22 sudo apt-get update
23 sudo apt-get install -y $ARCH-x-gcc make
22 export PATH=$PATH:/opt/$ARCH/bin 24 export PATH=$PATH:/opt/$ARCH/bin
23 fi 25 fi
24 26