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.

Travis: Simplify matrix, disable iphone and add X11 tools=no/clang
37f1bb32 · Rémi Verschelde · 6fc2fffb · 37f1bb32 · 37f1bb32
Commit 37f1bb32 authored Oct 27, 2017 by Rémi Verschelde
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 37 deletions

.travis.yml .travis.yml +21 -37

detect.py platform/x11/detect.py +4 -0

No files found.
--- 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
--- 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"