summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-10-27 19:18:22 +0200
committerRémi Verschelde <rverschelde@gmail.com>2017-10-27 19:56:37 +0200
commit37f1bb3298150be7abe5c8bc0707c49372dd82a2 (patch)
tree756255e15c7e0ce92e680bd481ccc3b23b3d5b16
parent6fc2fffb459e8c6deb87fe795e8103747f09b077 (diff)
Travis: Simplify matrix, disable iphone and add X11 tools=no/clang
Travis always has massive backlog of macOS builds, so we can't rely on them too much. The iphone build was mostly useful to spot tools=no or target=release_debug issues, so replacing it by an appropriate X11 build.
-rw-r--r--.travis.yml58
-rw-r--r--platform/x11/detect.py4
2 files changed, 25 insertions, 37 deletions
diff --git a/.travis.yml b/.travis.yml
index a2c3417412..409c870e79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,45 +6,29 @@ sudo: false
cache: ccache
-compiler:
- - gcc
- - clang
-
-os:
- - linux
- - osx
-
-env:
- - GODOT_TARGET=iphone
- - GODOT_TARGET=osx
- - GODOT_TARGET=x11
- #- GODOT_TARGET=android
- #- GODOT_TARGET=windows
-
matrix:
include:
- env: STATIC_CHECKS=yes
- exclude:
- - os: linux
- env: GODOT_TARGET=iphone
- - os: linux
- env: GODOT_TARGET=osx
- - os: linux
- env: GODOT_TARGET=android
- - os: osx
- env: GODOT_TARGET=x11
- - os: osx
- env: GODOT_TARGET=windows
- - compiler: gcc
- env: GODOT_TARGET=iphone
- - compiler: gcc
- env: GODOT_TARGET=osx
- - compiler: clang
- env: GODOT_TARGET=android
- - compiler: clang
- env: GODOT_TARGET=windows
- - compiler: clang
- env: GODOT_TARGET=x11
+ os: linux
+ compiler: clang
+ - env: GODOT_TARGET=x11 TOOLS=yes
+ os: linux
+ compiler: gcc
+ - env: GODOT_TARGET=x11 TOOLS=no
+ os: linux
+ compiler: clang
+ #- env: GODOT_TARGET=windows TOOLS=yes
+ # os: linux
+ # compiler: gcc
+ - env: GODOT_TARGET=osx TOOLS=yes
+ os: osx
+ compiler: clang
+ #- env: GODOT_TARGET=android TOOLS=no
+ # os: osx
+ # compiler: clang
+ #- env: GODOT_TARGET=iphone TOOLS=no
+ # os: osx
+ # compiler: clang
addons:
apt:
@@ -92,5 +76,5 @@ script:
- if [ "$STATIC_CHECKS" = "yes" ]; then
sh ./misc/travis/clang-format.sh;
else
- scons -j 2 platform=$GODOT_TARGET progress=no verbose=yes CXX=$CXX;
+ scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no;
fi
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 8c68c9ffd1..56bc1d4c59 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -101,6 +101,10 @@ def configure(env):
## Compiler configuration
+ if 'CXX' in env and 'clang' in env['CXX']:
+ # Convenience check to enforce the use_llvm overrides when CXX is clang(++)
+ env['use_llvm'] = True
+
if env['use_llvm']:
if ('clang++' not in env['CXX']):
env["CC"] = "clang"