Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only build 'merge build'

This commit is contained in:
James Chen 2014-05-12 21:59:32 +08:00
parent 91d684d077
commit e3ccf41ed9
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/travis-scripts/before-install.sh
View File

@ -72,6 +72,10 @@ elif [ "$PLATFORM"x = "emscripten"x ]; then
install_android_ndk install_android_ndk
elif [ "$PLATFORM"x = "mac-ios"x ]; then elif [ "$PLATFORM"x = "mac-ios"x ]; then
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
exit 0
fi
if [ "$PUSH_TO_MAC"x = "YES"x ]; then if [ "$PUSH_TO_MAC"x = "YES"x ]; then
cd $COCOS2DX_ROOT cd $COCOS2DX_ROOT
git config user.email ${GH_EMAIL_MAC} git config user.email ${GH_EMAIL_MAC}

4
tools/travis-scripts/run-script.sh
View File

@ -113,6 +113,10 @@ elif [ "$PLATFORM"x = "emscripten"x ]; then
export LLVM_ROOT=$LLVM export LLVM_ROOT=$LLVM
EMCC_DEBUG=1 make PLATFORM=emscripten -j 8 EMCC_DEBUG=1 make PLATFORM=emscripten -j 8
elif [ "$PLATFORM"x = "mac-ios"x ]; then elif [ "$PLATFORM"x = "mac-ios"x ]; then
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
exit 0
fi
if [ "$PUSH_TO_MAC"x != "YES"x ]; then if [ "$PUSH_TO_MAC"x != "YES"x ]; then
cd $COCOS2DX_ROOT/tools/travis-scripts cd $COCOS2DX_ROOT/tools/travis-scripts
./generate-bindings.sh ./generate-bindings.sh