Updated CI scripts

stealthcopter · stealthcopter · commit 9e550110c9a8 · 2018-06-17T17:31:43.000+01:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,6 +32,7 @@ android {
     targetSdkVersion targetSdkVer
     versionCode versionName
     versionName versionCode
+    archivesBaseName = "AndroidNetworkTools"
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
 
diff --git a/scripts/github-release.sh b/scripts/github-release.sh
@@ -12,8 +12,6 @@ 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/"
 
 function create_github_release { 
@@ -22,7 +20,7 @@ function create_github_release {
     
     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`
+    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": false}' $GITHUB_RELEASE_URL`
     
     echo "Got response $response"
     
@@ -34,6 +32,14 @@ function create_github_release {
     
     echo "Found id $id"
     
+    # Upload apk file
+    GITHUB_RELEASE_FILE_PATH="app/build/outputs/apk/release/AndroidNetworkTools.apk"
+    GITHUB_RELASE_FILENAME="AndroidNetworkTools.apk"
+    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
+
+    # Upload jar file
+    GITHUB_RELEASE_FILE_PATH="library/build/libs/library.jar"
+    GITHUB_RELASE_FILENAME="AndroidNetworkTools.jar"
     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

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ android {`
`32`	`32`	`targetSdkVersion targetSdkVer`
`33`	`33`	`versionCode versionName`
`34`	`34`	`versionName versionCode`
	`35`	`+ archivesBaseName = "AndroidNetworkTools"`
`35`	`36`	`testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"`
`36`	`37`	`}`
`37`	`38`