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

[ci] Updates travis scripts.

This commit is contained in:
James Chen 2014-03-25 16:24:08 +08:00
parent f55dd3d222
commit bb190fe78a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/travis-scripts/generate-bindings.sh
View File

@ -23,6 +23,7 @@ ELAPSEDSECS=`date +%s`
COCOS_BRANCH="update_lua_bindings_$ELAPSEDSECS" COCOS_BRANCH="update_lua_bindings_$ELAPSEDSECS"
COCOS_ROBOT_REMOTE="https://${GH_USER}:${GH_PASSWORD}@github.com/${GH_USER}/cocos2d-x.git" COCOS_ROBOT_REMOTE="https://${GH_USER}:${GH_PASSWORD}@github.com/${GH_USER}/cocos2d-x.git"
PULL_REQUEST_REPO="https://api.github.com/repos/cocos2d/cocos2d-x/pulls" PULL_REQUEST_REPO="https://api.github.com/repos/cocos2d/cocos2d-x/pulls"
FETCH_REMOTE_BRANCH="develop"
# Exit on error # Exit on error
set -e set -e
@ -88,12 +89,14 @@ pushd "$PROJECT_ROOT"
git status git status
echo echo
echo Comparing with HEAD ... echo Comparing with origin HEAD ...
echo echo
git fetch origin ${FETCH_REMOTE_BRANCH}
# Don't exit on non-zero return value # Don't exit on non-zero return value
set +e set +e
git diff --stat --exit-code git diff FETCH_HEAD --stat --exit-code
DIFF_RETVAL=$? DIFF_RETVAL=$?
if [ $DIFF_RETVAL -eq 0 ] if [ $DIFF_RETVAL -eq 0 ]

7
tools/travis-scripts/generate-cocosfiles.sh
View File

@ -6,6 +6,7 @@ PROJECT_ROOT="$DIR"/../..
COMMITTAG="[AUTO][ci skip]: updating cocos2dx_files.json" COMMITTAG="[AUTO][ci skip]: updating cocos2dx_files.json"
PUSH_REPO="https://api.github.com/repos/cocos2d/cocos2d-x/pulls" PUSH_REPO="https://api.github.com/repos/cocos2d/cocos2d-x/pulls"
OUTPUT_FILE_PATH="${PROJECT_ROOT}/templates/cocos2dx_files.json" OUTPUT_FILE_PATH="${PROJECT_ROOT}/templates/cocos2dx_files.json"
FETCH_REMOTE_BRANCH="develop"
# Exit on error # Exit on error
set -e set -e
@ -51,12 +52,14 @@ pushd "$PROJECT_ROOT"
git status git status
echo echo
echo Comparing with HEAD ... echo Comparing with origin HEAD ...
echo echo
git fetch origin ${FETCH_REMOTE_BRANCH}
# Don't exit on non-zero return value # Don't exit on non-zero return value
set +e set +e
git diff --stat --exit-code git diff FETCH_HEAD --stat --exit-code
DIFF_RETVAL=$? DIFF_RETVAL=$?
if [ $DIFF_RETVAL -eq 0 ] if [ $DIFF_RETVAL -eq 0 ]