Use GITHUB_TOKEN instead of own private access token

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

.github/workflows/qa.yml

@@ -17,8 +17,6 @@ jobs:
                 env:
                     KS_PASS: ${{ secrets.KS_PASS }}
                     KEY_PASS: ${{ secrets.KEY_PASS }}
-                    GIT_USERNAME: ${{ secrets.GIT_USERNAME }}
-                    GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
                     LOG_USERNAME: ${{ secrets.LOG_USERNAME }}
                     LOG_PASSWORD: ${{ secrets.LOG_PASSWORD }}
                 run: |
@@ -28,4 +26,4 @@ jobs:
                     sed -i "/qa/,/\}/ s/versionName .*/versionName \"${{github.event.number}}\"/" build.gradle
                     ./gradlew assembleQaDebug
                     $(find /usr/local/lib/android/sdk/build-tools/*/apksigner | sort | tail -n1) sign  --ks-pass pass:$KS_PASS --key-pass pass:$KEY_PASS --ks-key-alias key0 --ks scripts/QA_keystore.jks build/outputs/apk/qa/debug/qa-debug-*.apk
-                    sudo scripts/uploadArtifact.sh $LOG_USERNAME $LOG_PASSWORD ${{github.event.number}} ${{github.event.number}} $GIT_USERNAME $GIT_TOKEN
+                    sudo scripts/uploadArtifact.sh $LOG_USERNAME $LOG_PASSWORD ${{github.event.number}} ${{github.event.number}} ${{ secrets.GITHUB_TOKEN }}

.github/workflows/screenShotTest.yml

@@ -25,9 +25,7 @@ jobs:
                     ./gradlew assembleGplayDebug
             -   name: Delete old comments
                 env:
-                    GIT_USERNAME: ${{ secrets.GIT_USERNAME }}
-                    GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
-                run: scripts/deleteOldComments.sh "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}} "$GIT_USERNAME" "$GIT_TOKEN"
+                run: scripts/deleteOldComments.sh "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}} ${{ secrets.GITHUB_TOKEN }}
             -   name: run tests
                 uses: reactivecircus/android-emulator-runner@v2
                 with:
@@ -39,10 +37,8 @@ jobs:
                 env:
                     LOG_USERNAME: ${{ secrets.LOG_USERNAME }}
                     LOG_PASSWORD: ${{ secrets.LOG_PASSWORD }}
-                    GIT_USERNAME: ${{ secrets.GIT_USERNAME }}
-                    GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
                 run:
-                    scripts/uploadReport.sh "$LOG_USERNAME" "$LOG_PASSWORD" ${{github.event.number}} "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}} "$GIT_USERNAME" "$GIT_TOKEN"
+                    scripts/uploadReport.sh "$LOG_USERNAME" "$LOG_PASSWORD" ${{github.event.number}} "${{ matrix.color }}-${{ matrix.scheme }}" "Screenshot" ${{github.event.number}} ${{ secrets.GITHUB_TOKEN }}
             -   name: Archive Espresso results
                 uses: actions/upload-artifact@v2
                 if: ${{ always() }}

scripts/deleteOldComments.sh

@@ -5,8 +5,7 @@
 #4: BRANCH (stable or master)
 #5: TYPE (IT or Unit)
 #6: DRONE_PULL_REQUEST
-#7: GIT_USERNAME
-#8: GIT_TOKEN
+#7: GITHUB_TOKEN
 
 BRANCH=$1
 TYPE=$2
@@ -17,13 +16,13 @@ BRANCH_TYPE=$BRANCH-$TYPE
 
  # delete all old comments, matching this type
 echo "Deleting old comments for $BRANCH_TYPE"
-oldComments=$(curl 2>/dev/null -u $GITHUB_USER:$GITHUB_PASSWORD -X GET https://api.github.com/repos/nextcloud/android/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"|")
+oldComments=$(curl 2>/dev/null --header "authorization: Bearer $GITHUB_TOKEN" -X GET https://api.github.com/repos/nextcloud/android/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"|")
 count=$(echo $oldComments | grep true | wc -l)
 echo "Found $count old comments"
 
 echo $oldComments | while read comment ; do
 echo "Deleting comment: $comment"
-curl 2>/dev/null -u $GITHUB_USER:$GITHUB_PASSWORD -X DELETE https://api.github.com/repos/nextcloud/android/issues/comments/$comment
+curl 2>/dev/null --header "authorization: Bearer $GITHUB_TOKEN" -X DELETE https://api.github.com/repos/nextcloud/android/issues/comments/$comment
 done
 
 exit 0

scripts/uploadArtifact.sh

@@ -4,8 +4,7 @@
 #2: LOG_PASSWORD
 #3: DRONE_BUILD_NUMBER
 #4: DRONE_PULL_REQUEST
-#5: GIT_USERNAME
-#6: GIT_TOKEN
+#5: GITHUB_TOKEN
 
 DAV_URL=https://nextcloud.kaminsky.me/remote.php/webdav/android-artifacts/
 PUBLIC_URL=https://www.kaminsky.me/nc-dev/android-artifacts
@@ -13,8 +12,7 @@ USER=$1
 PASS=$2
 BUILD=$3
 PR=$4
-GIT_USERNAME=$5
-GIT_TOKEN=$6
+GITHUB_TOKEN=$5
 
 if ! test -e build/outputs/apk/qa/debug/qa-debug-*.apk ; then
     exit 1
@@ -22,10 +20,10 @@ fi
 echo "Uploaded artifact to $DAV_URL/$BUILD.apk"
 
 # delete all old comments, starting with "APK file:"
-oldComments=$(curl 2>/dev/null -u $GIT_USERNAME:$GIT_TOKEN -X GET https://api.github.com/repos/nextcloud/android/issues/$PR/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) + "|" + (.body | test("APK file:.*") | tostring)'  | grep "true|true" | tr -d "\"" | cut -f1 -d"|")
+oldComments=$(curl 2>/dev/null --header "authorization: Bearer $GITHUB_TOKEN" -X GET https://api.github.com/repos/nextcloud/android/issues/$PR/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("nextcloud-android-bot") | tostring) + "|" + (.body | test("APK file:.*") | tostring)'  | grep "true|true" | tr -d "\"" | cut -f1 -d"|")
 
 echo $oldComments | while read comment ; do
-    curl 2>/dev/null -u $GIT_USERNAME:$GIT_TOKEN -X DELETE https://api.github.com/repos/nextcloud/android/issues/comments/$comment
+    curl 2>/dev/null --header "authorization: Bearer $GITHUB_TOKEN" -X DELETE https://api.github.com/repos/nextcloud/android/issues/comments/$comment
 done
 
 apt-get -y install qrencode
@@ -34,4 +32,4 @@ qrencode -o $PR.png "$PUBLIC_URL/$BUILD.apk"
 
 curl -u $USER:$PASS -X PUT $DAV_URL/$BUILD.apk --upload-file build/outputs/apk/qa/debug/qa-debug-*.apk
 curl -u $USER:$PASS -X PUT $DAV_URL/$BUILD.png --upload-file $PR.png
-curl -u $GIT_USERNAME:$GIT_TOKEN -X POST https://api.github.com/repos/nextcloud/android/issues/$PR/comments -d "{ \"body\" : \"APK file: $PUBLIC_URL/$BUILD.apk <br/><br/> ![qrcode]($PUBLIC_URL/$BUILD.png) <br/><br/>To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app. \" }"
+curl --header "authorization: Bearer $GITHUB_TOKEN" -X POST https://api.github.com/repos/nextcloud/android/issues/$PR/comments -d "{ \"body\" : \"APK file: $PUBLIC_URL/$BUILD.apk <br/><br/> ![qrcode]($PUBLIC_URL/$BUILD.png) <br/><br/>To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app. \" }"