aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml8
-rwxr-xr-xscripts/travis7
2 files changed, 8 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index fa4600b..73e8c16 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,15 +10,23 @@ matrix:
10 - compiler: clang 10 - compiler: clang
11 os: linux 11 os: linux
12 env: ARCH=native 12 env: ARCH=native
13 dist: trusty
14 sudo: required
13 - compiler: gcc 15 - compiler: gcc
14 os: linux 16 os: linux
15 env: ARCH=native 17 env: ARCH=native
18 dist: trusty
19 sudo: required
16 - compiler: gcc 20 - compiler: gcc
17 os: linux 21 os: linux
18 env: ARCH=mingw32 22 env: ARCH=mingw32
23 dist: trusty
24 sudo: required
19 - compiler: gcc 25 - compiler: gcc
20 os: linux 26 os: linux
21 env: ARCH=mingw64 27 env: ARCH=mingw64
28 dist: trusty
29 sudo: required
22 30
23script: 31script:
24 "./scripts/travis" 32 "./scripts/travis"
diff --git a/scripts/travis b/scripts/travis
index 542161d..408bc75 100755
--- a/scripts/travis
+++ b/scripts/travis
@@ -22,9 +22,6 @@ if [ "x$ARCH" = "xnative" ]; then
22 make test 22 make test
23 else 23 else
24 sudo apt-get update 24 sudo apt-get update
25 sudo apt-get install -y python-software-properties
26 sudo apt-add-repository -y ppa:kalakris/cmake
27 sudo apt-get update
28 sudo apt-get install -y cmake ninja-build 25 sudo apt-get install -y cmake ninja-build
29 cmake -GNinja .. 26 cmake -GNinja ..
30 ninja 27 ninja
@@ -38,10 +35,6 @@ else
38 export CC=$CPU-w64-mingw32-gcc 35 export CC=$CPU-w64-mingw32-gcc
39 36
40 if [ -z $(which $CC) ]; then 37 if [ -z $(which $CC) ]; then
41 # Update Ubuntu 12.04 with current mingw toolchain
42 sudo apt-get update
43 sudo apt-get install -y python-software-properties
44 sudo apt-add-repository -y ppa:tobydox/mingw-x-precise
45 sudo apt-get update 38 sudo apt-get update
46 sudo apt-get install -y $ARCH-x-gcc make 39 sudo apt-get install -y $ARCH-x-gcc make
47 export PATH=$PATH:/opt/$ARCH/bin 40 export PATH=$PATH:/opt/$ARCH/bin