Browse Source

Travis: Disable HTML5 again until ported to DisplayServer

Also re-enable macOS builds disabled in dbb3f992a4f4a145c46df69e0e900262b956f0e3.
Rémi Verschelde 5 years ago
parent
commit
be07f86f85
1 changed files with 20 additions and 20 deletions
  1. 20 20
      .travis.yml

+ 20 - 20
.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}"