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

issue #4020: Updates before-install.sh. and comment fix in generate-cocosfiles.sh.

This commit is contained in:
James Chen 2014-02-13 11:38:28 +08:00
parent a56b7e4f3f
commit 772cdf5739
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,9 @@ install_nacl_sdk()
nacl_sdk/naclsdk update --force pepper_canary nacl_sdk/naclsdk update --force pepper_canary
} }
if [ "$GEN_JSB"x = "YES"x ]; then elif [ "$GEN_COCOS_FILES"x = "YES"x ]; then
exit 0
elif [ "$GEN_JSB"x = "YES"x ]; then
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
exit 0 exit 0
fi fi

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

@ -94,7 +94,7 @@ git checkout -b "$COCOS_BRANCH"
git commit -m "$COMMITTAG : updating tools/project-creator/module/cocos_files.json" git commit -m "$COMMITTAG : updating tools/project-creator/module/cocos_files.json"
#Set remotes #Set remotes
git remote add upstream https://${GH_USER}:${GH_PASSWORD}@github.com/${GH_USER}/cocos2d-x.git 2> /dev/null > /dev/null git remote add upstream https://${GH_USER}:${GH_PASSWORD}@github.com/${GH_USER}/cocos2d-x.git 2> /dev/null > /dev/null
# 4. In Cocos2D-X repo, Push the commit with updated submodule to "master" of the cocos2d-x repository # 4. In Cocos2D-X repo, Push the commit to cocos2d-x repository
echo "Pushing to Robot's repo ..." echo "Pushing to Robot's repo ..."
git push -fq upstream "$COCOS_BRANCH" 2> /dev/null git push -fq upstream "$COCOS_BRANCH" 2> /dev/null