浏览代码

For CI - revert to exclude the EMCC's cache from CI's cache.
It seems it prevented EMCC from being activated correctly. Need to investigate further when got time.

Yao Wei Tjong 姚伟忠 7 年之前
父节点
当前提交
6f8f178bfd
共有 1 个文件被更改,包括 6 次插入6 次删除
  1. 6 6
      .travis.yml

+ 6 - 6
.travis.yml

@@ -465,7 +465,6 @@ cache:
   directories:
     - $HOME/cmake-3.9.2-Linux-x86_64/bin
     - $HOME/cmake-3.9.2-Linux-x86_64/share
-    - $HOME/.emscripten_cache
 dist: trusty
 sudo: false
 addons: {apt: {packages: [doxygen, graphviz]}}
@@ -481,11 +480,12 @@ env:
     - CCACHE_COMPRESS=1
     - CCACHE_MAXSIZE=100M
     - HOT=/home/travis/.ccache/.hot
+    - BRANCH=master
   matrix:
-    - URHO3D_LIB_TYPE=MODULE EMSCRIPTEN_WASM=0 BRANCH=master numjobs=4
-    - URHO3D_LIB_TYPE=STATIC EMSCRIPTEN_WASM=0 BRANCH=master
-    - URHO3D_LIB_TYPE=SHARED EMSCRIPTEN_WASM=0 BRANCH=master
-    # URHO3D_LIB_TYPE=MODULE BRANCH=incoming numjobs=4
+    - URHO3D_LIB_TYPE=MODULE EMSCRIPTEN_WASM=0 numjobs=4
+    - URHO3D_LIB_TYPE=STATIC EMSCRIPTEN_WASM=0
+    - URHO3D_LIB_TYPE=SHARED EMSCRIPTEN_WASM=0
+    # URHO3D_LIB_TYPE=MODULE numjobs=4
     - URHO3D_LIB_TYPE=STATIC BRANCH=incoming
     - URHO3D_LIB_TYPE=SHARED BRANCH=incoming
 stage: release build configuration
@@ -496,7 +496,7 @@ before_script:
   - export TAG=$(git describe --exact-match $TRAVIS_COMMIT 2>/dev/null); if [[ $TAG =~ [[:digit:]]+\.[[:digit:]]+ ]]; then export RELEASE_TAG=$TAG; fi
   - if [[ $RELEASE_TAG ]] || (! [[ $TRAVIS_BRANCH =~ [^-]+-[^-]+-CI ]] && echo $COMMIT_MESSAGE |grep -cq '\[ci package\]'); then export PACKAGE_UPLOAD=1; fi
   - if [[ "$URHO3D_LIB_TYPE" != "MODULE" ]] && (echo $COMMIT_MESSAGE |grep -cq '\[cache clear\]' || [[ ! -e $HOT ]]); then export URHO3D_SAMPLES=0; fi; touch $HOT
-  - if [[ $EMSCRIPTEN_WASM ]]; then export BINARYEN=binaryen-master-64bit; fi
+  - if [[ ! $EMSCRIPTEN_WASM ]]; then export BINARYEN=binaryen-master-64bit; fi
   - git clone --depth 1 --branch $BRANCH https://github.com/urho3d/emscripten-sdk.git && emscripten-sdk/emsdk activate --build=Release sdk-${BRANCH}-64bit $BINARYEN && source emscripten-sdk/emsdk_env.sh
   - for compiler in $EMSCRIPTEN/{emcc,em++}; do touch -d "2017-01-01 00:00:00 +0800" $compiler; done
   - if [[ ! -f $HOME/cmake-3.9.2-Linux-x86_64/bin/cmake ]]; then wget --no-check-certificate https://cmake.org/files/v3.9/cmake-3.9.2-Linux-x86_64.tar.gz -O $HOME/cmake.tar.gz && tar xf $HOME/cmake.tar.gz -C $HOME && rm $HOME/cmake.tar.gz; fi