Skip to content
Snippets Groups Projects
Commit 3cf5d1dd authored by Alam Ed Arias's avatar Alam Ed Arias
Browse files

travis-ci: fixup gcc-6 build and added xcode6.3

parent 0b1fc30d
Branches
Tags
1 merge request!74Travis ci
...@@ -61,7 +61,7 @@ matrix: ...@@ -61,7 +61,7 @@ matrix:
- libgl1-mesa-dev - libgl1-mesa-dev
- libgme-dev - libgme-dev
- p7zip-full - p7zip-full
compiler: gcc-7 compiler: gcc-6
#gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511 #gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
- os: linux - os: linux
compiler: clang compiler: clang
...@@ -73,6 +73,9 @@ matrix: ...@@ -73,6 +73,9 @@ matrix:
osx_image: beta-xcode6.2 osx_image: beta-xcode6.2
compiler: gcc compiler: gcc
#Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn) #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
- os: osx
osx_image: beta-xcode6.3
#
- os: osx - os: osx
osx_image: xcode6.4 osx_image: xcode6.4
#Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn) #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment