summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-04-10 12:42:27 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-04-10 12:42:27 +0200
commit6c2d36271d3ef3761ebcf611da2d270a6aac49bf (patch)
tree548ecd0c33ace45f5dc51f4cb882087fce05302e
parentcb7fe2c7936fa52fb95e6f8a8e7927a4f41030a6 (diff)
Travis: Reenable osx and iphone builds
We disabled them due to Travis having big infrastructure issues for osx builds, but it seems to be back under control now.
-rw-r--r--.travis.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml
index 4bad241c53..818f7b6398 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,12 +31,12 @@ matrix:
- env: GODOT_TARGET=android TOOLS=no CACHE_NAME=${GODOT_TARGET}-gcc
os: linux
compiler: gcc
- #- env: GODOT_TARGET=osx TOOLS=yes CACHE_NAME=${GODOT_TARGET}-clang-tools
- # os: osx
- # compiler: clang
- #- env: GODOT_TARGET=iphone TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang
- # os: osx
- # compiler: clang
+ - env: GODOT_TARGET=osx TOOLS=yes CACHE_NAME=${GODOT_TARGET}-clang-tools
+ os: osx
+ compiler: clang
+ - env: GODOT_TARGET=iphone TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang
+ os: osx
+ compiler: clang
addons:
apt: