summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml35
1 files changed, 9 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml
index 14ee95e77e..8cfd7a1a7f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,17 +55,15 @@ matrix:
packages:
- *linux_deps
-# TODO: Android support
-
-# - name: Android export template (release_debug, Clang)
-# stage: build
-# env: PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
-# os: linux
-# compiler: clang
-# addons:
-# apt:
-# packages:
-# - openjdk-8-jdk
+ - name: Android export template (release_debug, Clang)
+ stage: build
+ env: PLATFORM=android TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-clang EXTRA_ARGS="warnings=extra werror=yes"
+ os: linux
+ compiler: clang
+ addons:
+ apt:
+ packages:
+ - openjdk-8-jdk
- name: macOS editor (debug, Clang)
stage: build
@@ -92,21 +90,6 @@ matrix:
# packages:
# - scons
-# TODO: Dummy/Offscreen rasterizer
-
-# - name: Linux headless editor (release_debug, GCC 9, testing project exporting and script running)
-# stage: build
-# env: PLATFORM=server TOOLS=yes TARGET=release_debug CACHE_NAME=${PLATFORM}-tools-gcc-9 MATRIX_EVAL="CC=gcc-9 && CXX=g++-9" EXTRA_ARGS="warnings=extra werror=yes" TEST_PROJECT=yes
-# os: linux
-# compiler: gcc-9
-# addons:
-# apt:
-# sources:
-# - sourceline: "ppa:ubuntu-toolchain-r/test"
-# packages:
-# - *gcc9_deps
-# - *linux_deps
-
- name: Linux export template (release_debug, GCC 7, without 3D support)
stage: build
env: PLATFORM=linuxbsd TOOLS=no TARGET=release_debug CACHE_NAME=${PLATFORM}-gcc-7 EXTRA_ARGS="disable_3d=yes"