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

Merge pull request #6388 from dumganhar/travis-ci-build-fix 

'develop' -> 'v3' branch for travis ci.
This commit is contained in:
James Chen 2014-04-28 11:29:19 +08:00
parent aa04176d83 1634ae30c5
commit 7c38f5a74d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ ELAPSEDSECS=`date +%s`
COCOS_BRANCH="update_lua_bindings_$ELAPSEDSECS"
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"
FETCH_REMOTE_BRANCH="develop"
FETCH_REMOTE_BRANCH="v3"
COMMIT_PATH="cocos/scripting/lua-bindings/auto"
# Exit on error

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

@ -6,7 +6,7 @@ PROJECT_ROOT="$DIR"/../..
COMMITTAG="[AUTO][ci skip]: updating cocos2dx_files.json"
PUSH_REPO="https://api.github.com/repos/cocos2d/cocos2d-x/pulls"
OUTPUT_FILE_PATH="${PROJECT_ROOT}/templates/cocos2dx_files.json"
FETCH_REMOTE_BRANCH="develop"
FETCH_REMOTE_BRANCH="v3"
COMMIT_PATH="templates/cocos2dx_files.json"
# Exit on error