diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-26 14:46:17 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-26 16:24:10 +0100 |
| commit | be07f86f85ab70a48b310b42faa64e72a74ca694 (patch) | |
| tree | 7bce4c680e6686c9d29be8b479be5b39205ce7a3 | |
| parent | 15a9f94346c211b7afe96af500cb3405aabcf6b8 (diff) | |
Travis: Disable HTML5 again until ported to DisplayServer
Also re-enable macOS builds disabled in dbb3f992a4f4a145c46df69e0e900262b956f0e3.
| -rw-r--r-- | .travis.yml | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/.travis.yml b/.travis.yml index f6c40382dd..8b58e12563 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}" |