From be07f86f85ab70a48b310b42faa64e72a74ca694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 26 Mar 2020 14:46:17 +0100 Subject: [PATCH] Travis: Disable HTML5 again until ported to DisplayServer Also re-enable macOS builds disabled in dbb3f992a4f4a145c46df69e0e900262b956f0e3. --- .travis.yml | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index f6c40382dd3..8b58e125634 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,17 +67,17 @@ matrix: # packages: # - openjdk-8-jdk -# - name: macOS editor (debug, Clang) -# stage: build -# env: PLATFORM=osx TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-clang EXTRA_ARGS="warnings=extra werror=yes" -# os: osx -# osx_image: xcode11.3 -# compiler: clang -# addons: -# homebrew: -# packages: -# - scons -# update: true + - name: macOS editor (debug, Clang) + stage: build + env: PLATFORM=osx TOOLS=yes TARGET=debug CACHE_NAME=${PLATFORM}-tools-clang EXTRA_ARGS="warnings=extra werror=yes" + os: osx + osx_image: xcode11.3 + compiler: clang + addons: + homebrew: + packages: + - scons + update: true # TODO: iOS MoltenVK support @@ -117,15 +117,15 @@ matrix: packages: - *linux_deps - - name: Javascript export template (release, emscripten latest) - stage: build - env: PLATFORM=javascript TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-emcc-latest EXTRA_ARGS="use_closure_compiler=yes" - os: linux - compiler: clang - addons: - apt: - packages: - - *linux_deps +# - name: Javascript export template (release, emscripten latest) +# stage: build +# env: PLATFORM=javascript TOOLS=no TARGET=release CACHE_NAME=${PLATFORM}-emcc-latest EXTRA_ARGS="use_closure_compiler=yes" +# os: linux +# compiler: clang +# addons: +# apt: +# packages: +# - *linux_deps before_install: - eval "${MATRIX_EVAL}"