fix qa

fix lint
fix uploadArtifact.sh

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

.github/workflows/qa.yml

@@ -29,8 +29,8 @@ jobs:
                 run: |
                     mkdir -p $HOME/.gradle
                     echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > $HOME/.gradle/gradle.properties
-                    sed -i "/qa/,/\}/ s/versionCode .*/versionCode ${{github.event.number}} /" build.gradle
-                    sed -i "/qa/,/\}/ s/versionName .*/versionName \"${{github.event.number}}\"/" build.gradle
+                    sed -i "/qa/,/\}/ s/versionCode .*/versionCode ${{github.event.number}} /" app/build.gradle
+                    sed -i "/qa/,/\}/ s/versionName .*/versionName \"${{github.event.number}}\"/" app/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
+                    $(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 app/build/outputs/apk/qa/debug/qa-debug-*.apk
                     sudo scripts/uploadArtifact.sh $LOG_USERNAME $LOG_PASSWORD ${{github.event.number}} ${{github.event.number}} ${{ secrets.GITHUB_TOKEN }}

scripts/analysis/lint-up.rb

@@ -18,7 +18,7 @@ TRAVIS_GIT_USERNAME = String.new("Drone CI server")
 #   lintOptions {
 #       htmlOutput file("[FILE_NAME].html")
 #   }
-LINT_REPORT_FILE = String.new("build/reports/lint/lint.html")
+LINT_REPORT_FILE = String.new("app/build/reports/lint/lint.html")
 
 # File name and relative path of previous results of this script.
 PREVIOUS_LINT_RESULTS_FILE=String.new("scripts/analysis/lint-results.txt")

scripts/uploadArtifact.sh

@@ -14,7 +14,7 @@ BUILD=$3
 PR=$4
 GITHUB_TOKEN=$5
 
-if ! test -e build/outputs/apk/qa/debug/qa-debug-*.apk ; then
+if ! test -e app/build/outputs/apk/qa/debug/qa-debug-*.apk ; then
     exit 1
 fi
 echo "Uploaded artifact to $DAV_URL/$BUILD.apk"
@@ -30,6 +30,6 @@ apt-get -y install qrencode
 
 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.apk --upload-file app/build/outputs/apk/qa/debug/qa-debug-*.apk
 curl -u $USER:$PASS -X PUT $DAV_URL/$BUILD.png --upload-file $PR.png
 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. \" }"