From bb55272c5df85581cc85ff5b0841d940b5c10747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 20 Aug 2017 16:14:51 +0200 Subject: [PATCH] package/ci: use latest Emscripten on Travis. --- package/ci/travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/ci/travis.yml b/package/ci/travis.yml index 2cd75e041..2300e0e25 100644 --- a/package/ci/travis.yml +++ b/package/ci/travis.yml @@ -163,9 +163,7 @@ install: - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "android" ]; then export PATH=$HOME/cmake/bin:$PATH; fi - if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "desktop" ]; then export PLATFORM_GL_API=CGL; fi - if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "ios-simulator" ]; then gem install xcpretty; fi -# Emscripten 1.37.10 is broken (crashes during optimization), using 1.37.1 -# works. Replace with just `brew install emscripten` when sane again -- if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "emscripten" ]; then brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/53f53f6498ba0f507c443dd4f0c6217937f1ddf2/Formula/emscripten.rb && export LLVM=/usr/local/opt/emscripten/libexec/llvm/bin && emcc; fi +- if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "emscripten" ]; then brew install emscripten && export LLVM=/usr/local/opt/emscripten/libexec/llvm/bin && emcc; fi - if [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-sanitizers" ] || [ "$TARGET" == "desktop-gles" ]; then printf "[General]\ndrivers=null" > ~/.alsoftrc; fi # SDL on macOS and iOS (cached)