Another iteration of tagging releases

Author: stealthcopter

library/build.gradle

@@ -7,8 +7,8 @@ android {
   defaultConfig {
     minSdkVersion minSdkVer
     targetSdkVersion targetSdkVer
-    versionCode 5
-    versionName "0.2.30"
+    versionCode 7
+    versionName "0.2.34"
   }
   buildTypes {
     release {

scripts/config.sh

@@ -13,6 +13,9 @@ GITHUB_RELEASE_MODULE="library"
 GITHUB_RELEASE_DESC="This release was automatically generated by the CI server"
 GITHUB_RELEASE_URL="https://api.github.com/repos/stealthcopter/AndroidNetworkTools/releases"
 GITHUB_RELEASE_TOKEN=$ANDROID_NETWORK_TOOLS_GITHUB_RELEASE_TOKEN
+GITHUB_RELEASE_FILE_PATH="app/build/outputs/apk/app-regular-release.apk"
+GITHUB_RELASE_FILENAME="AndroidNetworkTools.apk"
+$GITHUB_UPLOAD_URL="https://uploads.github.com/repos/stealthcopter/AndroidNetworkTools/releases/"
 
 # Git info
 GIT_TAG=`git name-rev --name-only --tags HEAD`

scripts/github-release.sh

@@ -11,11 +11,17 @@ function create_github_release {
 
     version=`cat $1/build.gradle | grep -m 1 versionName | cut -d'"' -f 2`
 
-    response=`curl -v -i -X POST -H "Content-Type:application/json" -H "Authorization: token $GITHUB_RELEASE_TOKEN" -d '{"tag_name": "'$version'","name": "'$version'","body": "'"$GITHUB_RELEASE_DESC"'","draft": true}' $GITHUB_RELEASE_URL`
+    echo "Uploading release"
+    
+    response=`curl -X POST -H "Content-Type:application/json" -H "Authorization: token $GITHUB_RELEASE_TOKEN" -d '{"tag_name": "'$version'","name": "'$version'","body": "'"$GITHUB_RELEASE_DESC"'","draft": true}' $GITHUB_RELEASE_URL`
+    
+    echo "Got response $response"
 
     id=`echo $response | python -c "import json,sys;obj=json.load(sys.stdin);print obj['id'];"`
 
-    curl -H "Content-Type:application/zip" -H "Authorization: token $GITHUB_RELEASE_TOKEN" --data-binary @"/app/build/outputs/apk/app-regular-release.apk" https://api.github.com/repos/stealthcopter/AndroidNetworkTools/releases/$id/assets?name=AndroidNetworkTools.apk
+    echo "Found id $id"
+    
+    curl -H "Content-Type:application/zip" -H "Authorization: token $GITHUB_RELEASE_TOKEN" --data-binary @"$GITHUB_RELEASE_FILE_PATH" $GITHUB_UPLOAD_URL$id/assets?name=$GITHUB_RELASE_FILENAME
 
     return
 }