diff --git a/.travis.yml b/.travis.yml index 4c07791079..2b2dceb5fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: cpp env: matrix: - - GEN_COCOS_FILES=YES - PLATFORM=linux DEBUG=1 CC_COMPILER=gcc CXX_COMPILER=g++ - PLATFORM=linux DEBUG=1 CC_COMPILER=clang CXX_COMPILER=clang++ # Since switching to C++11 only the ARM version of the nactive client diff --git a/tools/travis-scripts/run-script.sh b/tools/travis-scripts/run-script.sh index 83d7fd05f7..f3760f5da2 100755 --- a/tools/travis-scripts/run-script.sh +++ b/tools/travis-scripts/run-script.sh @@ -20,26 +20,26 @@ if [ "$GEN_COCOS_FILES"x = "YES"x ]; then fi if [ -z "${GH_EMAIL}" ]; then echo "GH_EMAIL not set" - exit 0 + exit 1 fi if [ -z "${GH_USER}" ]; then echo "GH_USER not set" - exit 0 + exit 1 fi if [ -z "${GH_PASSWORD}" ]; then echo "GH_USER not set" - exit 0 + exit 1 fi cd $COCOS2DX_ROOT/tools/travis-scripts - ./generate-cocosfiles.sh + # ./generate-cocosfiles.sh elif [ "$PLATFORM"x = "android"x ]; then export NDK_ROOT=$HOME/bin/android-ndk # Generate binding glue codes echo "Generating bindings glue codes ..." cd $COCOS2DX_ROOT/tools/travis-scripts - ./generate-cocosfiles.sh + # ./generate-cocosfiles.sh cd $COCOS2DX_ROOT @@ -66,7 +66,7 @@ elif [ "$PLATFORM"x = "linux"x ]; then # Generate binding glue codes echo "Generating bindings glue codes ..." cd $COCOS2DX_ROOT/tools/travis-scripts - ./generate-cocosfiles.sh + # ./generate-cocosfiles.sh echo "Building cocos2d-x" cd $COCOS2DX_ROOT/build @@ -79,7 +79,7 @@ elif [ "$PLATFORM"x = "emscripten"x ]; then # Generate binding glue codes echo "Generating bindings glue codes ..." cd $COCOS2DX_ROOT/tools/travis-scripts - ./generate-cocosfiles.sh + # ./generate-cocosfiles.sh cd $COCOS2DX_ROOT/build export PYTHON=/usr/bin/python @@ -88,7 +88,7 @@ elif [ "$PLATFORM"x = "emscripten"x ]; then EMCC_DEBUG=1 make PLATFORM=emscripten -j 8 elif [ "$PLATFORM"x = "ios"x ]; then cd $COCOS2DX_ROOT/tools/travis-scripts - ./generate-cocosfiles.sh + # ./generate-cocosfiles.sh cd $COCOS2DX_ROOT xctool/xctool.sh -project samples/Cpp/HelloCpp/proj.ios/HelloCpp.xcodeproj -scheme HelloCpp test