diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index 84ec6fee0..d221f5491 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -11,7 +11,7 @@ ruby scripts/analysis/lint-up.rb $1 $2 $3 lintValue=$? -./gradlew assembleGplayDebug spotbugsGplayDebugReport +./gradlew assembleGplay app:spotbugsGplayReleaseReport # exit codes: # 0: count was reduced @@ -24,12 +24,12 @@ if [ $3 = "master" ]; then echo "New findbugs result for master at: https://www.kaminsky.me/nc-dev/talk-findbugs/master.html" curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-findbugs/master.html --upload-file app/build/reports/spotbugs/spotbugs.html - summary=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html | head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s'/Summary/FindBugs (master)/' | tr "\"" "\'" | tr -d "\r\n") - curl -u $4:$5 -X PUT -d "$summary" https://nextcloud.kaminsky.me/remote.php/webdav/talk-findbugs/findbugs.html + summary=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html | head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s'/Summary/SpotBugs (master)/' | tr "\"" "\'" | tr -d "\r\n") + curl -u $4:$5 -X PUT -d "$summary" https://nextcloud.kaminsky.me/remote.php/webdav/talk-findbugs/findbugs-summary-master.html if [ $lintValue -ne 1 ]; then echo "New lint result for master at: https://www.kaminsky.me/nc-dev/talk-lint/master.html" - curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-droneLogs/master.html --upload-file app/build/reports/lint/lint.html + curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-lint/master.html --upload-file app/build/reports/lint/lint.html exit 0 fi else @@ -56,8 +56,8 @@ else lintErrorOld=$(grep "[0-9]* error" scripts/analysis/lint-results.txt -o | cut -f1 -d" ") lintWarningOld=$(grep "[0-9]* warning" scripts/analysis/lint-results.txt -o | cut -f1 -d" ") lintResult="

Lint

TypeMasterPR
Warnings"$lintWarningOld""$lintWarningNew"
Errors"$lintErrorOld""$lintErrorNew"
" - findbugsResultNew=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html |head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"#Summary#FindBugs (new)#" | tr "\"" "\'" | tr -d "\n") - findbugsResultOld=$(curl 2>/dev/null https://www.kaminsky.me/nc-dev/talk-findbugs/findbugs.html | tr "\"" "\'" | tr -d "\r\n" | sed s'#FindBugs#FindBugs#'| tr "\"" "\'" | tr -d "\n") + findbugsResultNew=$(sed -n "/

Summary<\/h1>/,/

Warnings<\/h1>/p" app/build/reports/spotbugs/spotbugs.html |head -n-1 | sed s'/<\/a>//'g | sed s'///'g | sed s"#Summary#SpotBugs (new)#" | tr "\"" "\'" | tr -d "\n") + findbugsResultOld=$(curl 2>/dev/null https://www.kaminsky.me/nc-dev/talk-findbugs/findbugs-summary-master.html | tr "\"" "\'" | tr -d "\r\n" | sed s'#FindBugs#FindBugs#'| tr "\"" "\'" | tr -d "\n") curl -u $1:$2 -X POST https://api.github.com/repos/nextcloud/talk-android/issues/$7/comments -d "{ \"body\" : \"$lintResult $findbugsResultNew $findbugsResultOld \" }" if [ $lintValue -eq 2 ]; then diff --git a/scripts/analysis/lint-up.rb b/scripts/analysis/lint-up.rb index 0c36607cd..cdd087556 100644 --- a/scripts/analysis/lint-up.rb +++ b/scripts/analysis/lint-up.rb @@ -56,7 +56,7 @@ end # run Lint puts "running Lint..." -system './gradlew clean assembleGplay app:lint' +system './gradlew clean assembleGplay lint' # confirm that Lint ran w/out error result = $?.to_i @@ -178,7 +178,7 @@ previous_git_email = previous_git_email.strip # update git user name and email for this script system ("git config --local user.name '" + git_user + "'") -system ("git config --local user.email 'android@nextcloud.com'") +system ("git config --local user.email '.'") # set email blank system ("git remote rm origin") system ("git remote add origin https://" + git_user + ":" + git_token + "@github.com/nextcloud/talk-android")