diff --git a/.travis.yml b/.travis.yml index 0a045c260..f823c1e33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,6 @@ matrix: env: BUILD_TYPE=SDL - os: linux env: BUILD_TYPE=Qt - - os: osx - env: BUILD_TYPE=SDL - os: osx env: BUILD_TYPE=Qt - os: osx @@ -19,8 +17,6 @@ matrix: env: BUILD_TYPE=ANDROID - os: osx env: BUILD_TYPE=Emscripten - - os: linux - env: BUILD_TYPE=Emscripten android: components: @@ -77,10 +73,6 @@ before_install: - if [ "$BUILD_TYPE" == "Emscripten" ] && [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install emscripten && export LLVM=/usr/local/opt/emscripten/libexec/llvm/bin && emcc; fi - - if [ "$BUILD_TYPE" == "Emscripten" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then - git clone --depth 1 https://github.com/urho3d/emscripten-sdk.git && emscripten-sdk/emsdk activate --build=Release sdk-master-64bit && source emscripten-sdk/emsdk_env.sh && - export PATH=$(whereis -b ccache |grep -o '\S*lib\S*'):$PATH; for f in $EMSCRIPTEN/{emcc,em++}; do touch -d "2015-09-01 00:00:00 +0800" $f; done; - fi install: - if [ "$TRAVIS_OS_NAME" == "linux" ]; then diff --git a/tools/travis-script.sh b/tools/travis-script.sh index 492c9acb7..555850fe2 100755 --- a/tools/travis-script.sh +++ b/tools/travis-script.sh @@ -56,7 +56,7 @@ if [ "$BUILD_TYPE" = "Emscripten" ]; then mkdir build_emscripten cd build_emscripten emcmake cmake -DCMAKE_BUILD_TYPE=Debug .. - emmake make -j4 + emmake make cd .. fi