Set lint step for danger

koji-1009 · koji-1009 · commit ac7e9c266200 · 2019-04-26T15:31:51.000+09:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -47,23 +47,24 @@ commands:
           command: bundle exec danger
 
 jobs:
-  run_test:
+  unit_test:
     executor:
       name: default
     steps:
       - checkout
       - setup_android
       - unit_test
-  run_danger:
+  check_pr:
     executor:
       name: default
     steps:
       - checkout
+      - setup_android
       - setup_bundle
       - run_danger
 
 workflows:
   pull_request:
     jobs:
-      - run_test
-      - run_danger
+      - unit_test
+      - check_pr
diff --git a/Dangerfile b/Dangerfile
@@ -29,6 +29,6 @@ warn("A pull request must have some assignees") if github.pr_json["assignee"].ni
 #
 ####
 android_lint.gradle_task = "studyplus-android-sdk2:lint"
-android_lint.report_file = "studyplus-android-sdk2/build/reports/lint/lint-result.xml"
+android_lint.report_file = "studyplus-android-sdk2/build/reports/lint-results.xml"
 android_lint.filtering = true
 android_lint.lint(inline_mode: true)
diff --git a/studyplus-android-sdk2/build.gradle b/studyplus-android-sdk2/build.gradle
@@ -66,6 +66,10 @@ android {
             includeAndroidResources = true
         }
     }
+
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ warn("A pull request must have some assignees") if github.pr_json["assignee"].ni`
`29`	`29`	`#`
`30`	`30`	`####`
`31`	`31`	`android_lint.gradle_task = "studyplus-android-sdk2:lint"`
`32`		`-android_lint.report_file = "studyplus-android-sdk2/build/reports/lint/lint-result.xml"`
	`32`	`+android_lint.report_file = "studyplus-android-sdk2/build/reports/lint-results.xml"`
`33`	`33`	`android_lint.filtering = true`
`34`	`34`	`android_lint.lint(inline_mode: true)`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,10 @@ android {`
`66`	`66`	`includeAndroidResources = true`
`67`	`67`	`}`
`68`	`68`	`}`
	`69`	`+`
	`70`	`+ lintOptions {`
	`71`	`+ abortOnError false`
	`72`	`+ }`
`69`	`73`	`}`
`70`	`74`
`71`	`75`	`dependencies {`