aa

qa_shell_script/app/XyqbAndroidBuild.sh

@@ -12,10 +12,12 @@ product_flavors=$2
 
 cd ${project_path}
 
-if [ -z ${branch_name} ]; then
+function get_code()
+{
+    if [ -z ${branch_name} ]; then
         echo "checkout default branch master"
         git pull
-else
+    else
         echo "checkout specified branch ${branch_name}"
         which git
         git checkout ${branch_name}
@@ -26,29 +28,39 @@ else
             echo "Fail to checkout branch ${branch_name}".
             exit -1
         fi 
-fi
-
-echo "拷贝可使用的gradle文件"
-
-cp -r ${source_gradlefile} ${target_file}
+    fi
+}
 
-if [[ -z ${product_flavors} ]]; then
+function build_android()
+{
+    echo "拷贝可使用的gradle文件"
+    cp -r ${source_gradlefile} ${target_file}
+    if [[ -z ${product_flavors} ]]; then
         echo "${product_flavors}" > ${project_path}/markets.txt
-fi
-
-rm -rf ${project_path}/apk/
-
-echo "开始使用gradle进行编译该版本的代码"
-
-gradle clean resguard  --stacktrace --debug
-
-echo "重命名apk包名"
+    fi
+    rm -rf ${project_path}/apk/
+    echo "开始使用gradle进行编译该版本的代码"
+    gradle clean resguard  --stacktrace --debug
+    if [ $? = 0 ]; then
+            echo "gradle build is ok".
+            echo "开始重命名对应的渠道包"
+            apkfile=`find ${buildapk_path} -name "*${product_flavors}.apk"`
+            cp -r ${apkfile} ${project_path}/apk/${branch_name}_${product_flavors}.apk
+        else
+            echo "Fail to checkout branch ${branch_name}".
+            exit -1
+        fi 
+}
 
-apkfile=`find /home/quant_group/jenkins/workspace/XyqbAndroidBuild/build/archives -name "*${product_flavors}.apk"`
+function upload_apk()
+{
+   echo "正在将apk上传到蒲公英，请等待......"
+   curl -F "file=@/home/quant_group/jenkins/workspace/XyqbAndroidBuild/apk/${branch_name}_${product_flavors}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://static.pgyer.com/app/qrcode/lJrv 
+}
 
-cp ${apkfile} /home/quant_group/jenkins/workspace/XyqbAndroidBuild/apk/${branch_name}_${product_flavors}.apk
+get_code
 
-echo "正在将apk上传到蒲公英，请等待......"
+build_android
 
-curl -F "file=@/home/quant_group/jenkins/workspace/XyqbAndroidBuild/apk/${branch_name}_${product_flavors}.apk" -F "uKey=13d17385c02ea9ea994d0c985d87ff32" -F "_api_key=5b09af98d5a8ff43f2f39935fa6bfbc1" https://static.pgyer.com/app/qrcode/lJrv
+upload_apk