Browse Source

app module

tobiasKaminsky 7 years ago
parent
commit
6490719a64
2 changed files with 4 additions and 4 deletions
  1. 2 2
      scripts/lint/lint-up-wrapper.sh
  2. 2 2
      scripts/lint/lint-up.rb

+ 2 - 2
scripts/lint/lint-up-wrapper.sh

@@ -19,14 +19,14 @@ echo "Branch: $3"
 
 if [ $3 = "master" -a $returnValue -ne 1 ]; then
     echo "New master at: https://nextcloud.kaminsky.me/index.php/s/fyxdQjc7LCiy57C"
-    curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-droneLogs/master.html --upload-file build/reports/lint/lint.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
     exit 0
 else
     if [ -e $6 ]; then
         6="master-"$(date +%F)
     fi
     echo "New results at https://nextcloud.kaminsky.me/index.php/s/fyxdQjc7LCiy57C ->" $6.html
-    curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-droneLogs/$6.html --upload-file build/reports/lint/lint.html
+    curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/talk-droneLogs/$6.html --upload-file app/build/reports/lint/lint.html
     
     if [ $returnValue -eq 2 ]; then
         exit 0

+ 2 - 2
scripts/lint/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/lint/lint-results.txt")
@@ -61,7 +61,7 @@ system './gradlew clean assembleGplay lint'
 # confirm that Lint ran w/out error
 result = $?.to_i
 if result != 0
-    puts "FAIL: failed to run ./gradlew clean lint"
+    puts "FAIL: failed to run ./gradlew clean assembleGplay lint"
     exit 1
 end