delete outdated commentsdeleteOutdatedComments

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

3 files changed, 25 insertions, 2 deletions

diff --git a/.drone.yml b/.drone.yml
index cdda01c7..108ed6b3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -64,6 +64,8 @@ steps:
     - ./gradlew assembleDebug
     - ./scripts/wait_for_emulator.sh
     - ./scripts/wait_for_server.sh server-master
+    - scripts/deleteOutdatedComments.sh "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+    - scripts/deleteOutdatedComments.sh "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
     - ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
     - ./gradlew installDebugAndroidTest
     - ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "master" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
@@ -150,6 +152,8 @@ steps:
       - ./gradlew assembleDebug
       - ./scripts/wait_for_emulator.sh
       - ./scripts/wait_for_server.sh server-stable
+      - scripts/deleteOutdatedComments.sh "stable" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+      - scripts/deleteOutdatedComments.sh "stable" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
       - ./gradlew jacocoTestDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
       - ./gradlew installDebugAndroidTest
       - ./gradlew createDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "stable" "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
diff --git a/scripts/deleteOutdatedComments.sh b/scripts/deleteOutdatedComments.sh
new file mode 100755
index 00000000..6571b47a
--- /dev/null
+++ b/scripts/deleteOutdatedComments.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+BRANCH=$1
+TYPE=$2
+PR=$3
+GITHUB_USER=$4
+GITHUB_PASSWORD=$5
+BRANCH_TYPE=$BRANCH-$TYPE
+REPO="android-library"
+
+# delete all old comments, matching this type
+oldComments=$(curl 2>/dev/null -u $GITHUB_USER:$GITHUB_PASSWORD -X GET https://api.github.com/repos/nextcloud/$REPO/issues/$PR/comments | jq --arg TYPE $BRANCH_TYPE '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) + "|" + (.body | test([$TYPE]) | tostring)'| grep "true|true" | tr -d "\"" | cut -f1 -d"|")
+
+echo $oldComments | while read comment ; do
+    curl 2>/dev/null -u $GITHUB_USER:$GITHUB_PASSWORD -X DELETE https://api.github.com/repos/nextcloud/$REPO/issues/comments/$comment
+done
+
+exit 0
diff --git a/scripts/uploadReport.sh b/scripts/uploadReport.sh
index a876992e..0a429106 100755
--- a/scripts/uploadReport.sh
+++ b/scripts/uploadReport.sh
@@ -9,7 +9,8 @@ TYPE=$5
 PR_ID=$6
 GIT_USERNAME=$7
 GIT_TOKEN=$8
-REMOTE_FOLDER=$ID-$TYPE-$BRANCH
+REMOTE_FOLDER=$ID-$TYPE-$BRANCH-$(date +%H-%M)
+BRANCH_TYPE=$BRANCH-$TYPE
 
 if [ $TYPE = "IT" ]; then
     cd build/reports/androidTests/connected
@@ -22,5 +23,5 @@ find . -type f -exec curl -u $USER:$PASS -X PUT $URL/$REMOTE_FOLDER/$(echo {} |
 
 echo "Uploaded failing library tests to https://www.kaminsky.me/nc-dev/library-integrationTests/$REMOTE_FOLDER"
 
-curl -u $GIT_USERNAME:$GIT_TOKEN -X POST https://api.github.com/repos/nextcloud/android-library/issues/$PR_ID/comments -d "{ \"body\" : \"$TYPE test failed: https://www.kaminsky.me/nc-dev/library-integrationTests/$REMOTE_FOLDER \" }"
+curl -u $GIT_USERNAME:$GIT_TOKEN -X POST https://api.github.com/repos/nextcloud/android-library/issues/$PR_ID/comments -d "{ \"body\" : \"$BRANCH_TYPE test failed: https://www.kaminsky.me/nc-dev/library-integrationTests/$REMOTE_FOLDER \" }"
 exit 1