mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-12-29 05:41:02 +00:00
Merge branch 'master' into next
This commit is contained in:
commit
0fc848dc09
1 changed files with 21 additions and 21 deletions
42
.travis.yml
42
.travis.yml
|
@ -162,28 +162,28 @@ matrix:
|
||||||
- clang-3.8
|
- clang-3.8
|
||||||
compiler: clang-3.8
|
compiler: clang-3.8
|
||||||
#clang version 3.8.1-svn271127-1~exp1 (branches/release_38)
|
#clang version 3.8.1-svn271127-1~exp1 (branches/release_38)
|
||||||
- os: osx
|
|
||||||
osx_image: beta-xcode6.1
|
|
||||||
#Apple LLVM version 6.0 (clang-600.0.54) (based on LLVM 3.5svn)
|
|
||||||
- os: osx
|
|
||||||
osx_image: beta-xcode6.2
|
|
||||||
compiler: gcc
|
|
||||||
#Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
|
|
||||||
# - os: osx
|
# - os: osx
|
||||||
# osx_image: beta-xcode6.3
|
# osx_image: beta-xcode6.1
|
||||||
# #I think xcode.6.3 VM is broken, it does not boot
|
# #Apple LLVM version 6.0 (clang-600.0.54) (based on LLVM 3.5svn)
|
||||||
- os: osx
|
# - os: osx
|
||||||
osx_image: xcode6.4
|
# osx_image: beta-xcode6.2
|
||||||
#Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
|
# compiler: gcc
|
||||||
- os: osx
|
# #Apple LLVM version 6.0 (clang-600.0.57) (based on LLVM 3.5svn)
|
||||||
osx_image: xcode7
|
## - os: osx
|
||||||
#Apple LLVM version 7.0.0 (clang-700.0.72)
|
## osx_image: beta-xcode6.3
|
||||||
- os: osx
|
## #I think xcode.6.3 VM is broken, it does not boot
|
||||||
osx_image: xcode7.1
|
# - os: osx
|
||||||
#Apple LLVM version 7.0.0 (clang-700.1.76)
|
# osx_image: xcode6.4
|
||||||
- os: osx
|
# #Apple LLVM version 6.1.0 (clang-602.0.53) (based on LLVM 3.6.0svn)
|
||||||
osx_image: xcode7.2
|
# - os: osx
|
||||||
#Apple LLVM version 7.0.2 (clang-700.1.81)
|
# osx_image: xcode7
|
||||||
|
# #Apple LLVM version 7.0.0 (clang-700.0.72)
|
||||||
|
# - os: osx
|
||||||
|
# osx_image: xcode7.1
|
||||||
|
# #Apple LLVM version 7.0.0 (clang-700.1.76)
|
||||||
|
# - os: osx
|
||||||
|
# osx_image: xcode7.2
|
||||||
|
# #Apple LLVM version 7.0.2 (clang-700.1.81)
|
||||||
- os: osx
|
- os: osx
|
||||||
osx_image: xcode7.3
|
osx_image: xcode7.3
|
||||||
#Apple LLVM version 7.3.0 (clang-703.0.31)
|
#Apple LLVM version 7.3.0 (clang-703.0.31)
|
||||||
|
|
Loading…
Reference in a new issue