From 889d0669bbd9b995a585b951b8d9eaf23011b6b9 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 16 May 2019 14:34:49 +0200
Subject: [PATCH] email on failure

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .drone.yml    | 264 ++++++++++++++++++++++++--------------------------
 .editorconfig |   7 +-
 2 files changed, 130 insertions(+), 141 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 8236b30795..7467f58201 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,37 +2,32 @@ kind: pipeline
 name: generic
 
 steps:
-- name: generic
-  image: nextcloudci/android:android-44
-  commands:
-    - ./gradlew assembleGeneric
+  - name: generic
+    image: nextcloudci/android:android-44
+    commands:
+      - ./gradlew assembleGeneric
 
-- name: notify
-  image: drillster/drone-email
-  host: $EMAIL_HOST
-  port: 587
-  username: $EMAIL_USERNAME
-  password: $EMAIL_PASSWORD
-  from: nextcloud-drone@kaminsky.me
-  skip_verify: true
-  recipients_only: true
-  recipients: [ $EMAIL_RECIPIENTS ]
-  environment:
-      EMAIL_USERNAME:
-          from_secret: EMAIL_USERNAME
-      EMAIL_PASSWORD:
-          from_secret: EMAIL_PASSWORD
-      EMAIL_RECIPIENTS:
-          from_secret: EMAIL_RECIPIENTS
-      EMAIL_HOST:
-          from_secret: EMAIL_HOST
-  when:
+  - name: notify
+    image: drillster/drone-email
+    settings:
+      port: 587
+      from: nextcloud-drone@kaminsky.me
+      recipients_only: true
+      username:
+        from_secret: EMAIL_USERNAME
+      password:
+        from_secret: EMAIL_PASSWORD
+      recipients:
+        from_secret: EMAIL_RECIPIENTS
+      host:
+        from_secret: EMAIL_HOST
+    when:
       event:
-          - push
+        - push
       status:
-          - failure
+        - failure
       branch:
-          - master
+        - master
 
 trigger:
   branch:
@@ -46,113 +41,103 @@ kind: pipeline
 name: gplay
 
 steps:
-- name: gplay
-  image: nextcloudci/android:android-44
-  privileged: true
-  environment:
-    LOG_USERNAME:
-      from_secret: LOG_USERNAME
-    LOG_PASSWORD:
-      from_secret: LOG_PASSWORD
-    GIT_USERNAME:
-      from_secret: GIT_USERNAME
-    GIT_TOKEN:
-      from_secret: GIT_TOKEN
-  commands:
-    - ./gradlew assembleGplay
-    - emulator -avd android-27 -no-window -no-audio &
-    - ./wait_for_emulator.sh
-    - ./gradlew assembleGplayDebug
-    - ./gradlew jacocoTestGplayDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
-    - ./gradlew installGplayDebugAndroidTest
-    - ./gradlew createGplayDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
-    - ./gradlew combinedTestReport
-    - curl -o codecov.sh https://codecov.io/bash
-    - bash ./codecov.sh -t fc506ba4-33c3-43e4-a760-aada38c24fd5
-    - scripts/uploadArtifact.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
-- name: notify
-  image: drillster/drone-email
-  host: $EMAIL_HOST
-  port: 587
-  username: $EMAIL_USERNAME
-  password: $EMAIL_PASSWORD
-  from: nextcloud-drone@kaminsky.me
-  skip_verify: true
-  recipients_only: true
-  recipients: [ $EMAIL_RECIPIENTS ]
-  environment:
-      EMAIL_USERNAME:
-          from_secret: EMAIL_USERNAME
-      EMAIL_PASSWORD:
-          from_secret: EMAIL_PASSWORD
-      EMAIL_RECIPIENTS:
-          from_secret: EMAIL_RECIPIENTS
-      EMAIL_HOST:
-          from_secret: EMAIL_HOST
-  when:
+  - name: gplay
+    image: nextcloudci/android:android-44
+    privileged: true
+    environment:
+      LOG_USERNAME:
+        from_secret: LOG_USERNAME
+      LOG_PASSWORD:
+        from_secret: LOG_PASSWORD
+      GIT_USERNAME:
+        from_secret: GIT_USERNAME
+      GIT_TOKEN:
+        from_secret: GIT_TOKEN
+    commands:
+      - ./gradlew assembleGplay
+      - emulator -avd android-27 -no-window -no-audio &
+      - ./wait_for_emulator.sh
+      - ./gradlew assembleGplayDebug
+      - ./gradlew jacocoTestGplayDebugUnitTestReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "Unit" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+      - ./gradlew installGplayDebugAndroidTest
+      - ./gradlew createGplayDebugCoverageReport || scripts/uploadReport.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER "IT" $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+      - ./gradlew combinedTestReport
+      - curl -o codecov.sh https://codecov.io/bash
+      - bash ./codecov.sh -t fc506ba4-33c3-43e4-a760-aada38c24fd5
+        - scripts/uploadArtifact.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+  - name: notify
+    image: drillster/drone-email
+    settings:
+      port: 587
+      from: nextcloud-drone@kaminsky.me
+      recipients_only: true
+      username:
+        from_secret: EMAIL_USERNAME
+      password:
+        from_secret: EMAIL_PASSWORD
+      recipients:
+        from_secret: EMAIL_RECIPIENTS
+      host:
+        from_secret: EMAIL_HOST
+    when:
       event:
-          - push
+        - push
       status:
-          - failure
+        - failure
       branch:
-          - master
+        - master
 
 services:
-- name: server
-  image: nextcloudci/server:server-3
+  - name: server
+    image: nextcloudci/server:server-3
 
 trigger:
   branch:
     - master
   event:
-   - push
-   - pull_request
+    - push
+    - pull_request
 ---
 kind: pipeline
 name: analysis
 
 steps:
-- name: analysis
-  image: nextcloudci/android:android-44
-  environment:
-    GIT_USERNAME:
-      from_secret: GIT_USERNAME
-    GIT_TOKEN:
-      from_secret: GIT_TOKEN
-    LOG_USERNAME:
-      from_secret: LOG_USERNAME
-    LOG_PASSWORD:
-      from_secret: LOG_PASSWORD
-  commands:
-    - export BRANCH=$(scripts/analysis/getBranchName.sh $GIT_USERNAME $GIT_TOKEN $DRONE_PULL_REQUEST)
-    - scripts/analysis/analysis-wrapper.sh $GIT_USERNAME $GIT_TOKEN $BRANCH $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER $DRONE_PULL_REQUEST
+  - name: analysis
+    image: nextcloudci/android:android-44
+    environment:
+      GIT_USERNAME:
+        from_secret: GIT_USERNAME
+      GIT_TOKEN:
+        from_secret: GIT_TOKEN
+      LOG_USERNAME:
+        from_secret: LOG_USERNAME
+      LOG_PASSWORD:
+        from_secret: LOG_PASSWORD
+    commands:
+      - export BRANCH=$(scripts/analysis/getBranchName.sh $GIT_USERNAME $GIT_TOKEN $DRONE_PULL_REQUEST)
+      - scripts/analysis/analysis-wrapper.sh $GIT_USERNAME $GIT_TOKEN $BRANCH $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER $DRONE_PULL_REQUEST
 
-- name: notify
-  image: drillster/drone-email
-  host: $EMAIL_HOST
-  port: 587
-  username: $EMAIL_USERNAME
-  password: $EMAIL_PASSWORD
-  from: nextcloud-drone@kaminsky.me
-  skip_verify: true
-  recipients_only: true
-  recipients: [ $EMAIL_RECIPIENTS ]
-  environment:
-      EMAIL_USERNAME:
-      from_secret: EMAIL_USERNAME
-      EMAIL_PASSWORD:
-      from_secret: EMAIL_PASSWORD
-      EMAIL_RECIPIENTS:
-          from_secret: EMAIL_RECIPIENTS
-      EMAIL_HOST:
-          from_secret: EMAIL_HOST
-  when:
+  - name: notify
+    image: drillster/drone-email
+    settings:
+      port: 587
+      from: nextcloud-drone@kaminsky.me
+      recipients_only: true
+      username:
+        from_secret: EMAIL_USERNAME
+      password:
+        from_secret: EMAIL_PASSWORD
+      recipients:
+        from_secret: EMAIL_RECIPIENTS
+      host:
+        from_secret: EMAIL_HOST
+    when:
       event:
-          - push
+        - push
       status:
-          - failure
+        - failure
       branch:
-          - master
+        - master
 
 trigger:
   branch:
@@ -165,28 +150,29 @@ kind: pipeline
 name: qa
 
 steps:
-    - name: qa
-      image: nextcloudci/android:android-44
-      privileged: true
-      environment:
-          LOG_USERNAME:
-              from_secret: LOG_USERNAME
-          LOG_PASSWORD:
-              from_secret: LOG_PASSWORD
-          GIT_USERNAME:
-              from_secret: GIT_USERNAME
-          GIT_TOKEN:
-              from_secret: GIT_TOKEN
-          KS_PASS:
-              from_secret: KS_PASS
-          KEY_PASS:
-              from_secret: KEY_PASS
-      commands:
-          - sed -i "/qa/,/\}/ s/versionCode .*/versionCode $DRONE_BUILD_NUMBER/" build.gradle
-          - sed -i "/qa/,/\}/ s/versionName .*/versionName \"$DRONE_BUILD_NUMBER\"/" build.gradle
-          - ./gradlew assembleQaDebug
-          - /opt/android-sdk-linux/build-tools/*/apksigner 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
-          - scripts/uploadArtifact.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+  - name: qa
+    image: nextcloudci/android:android-44
+    privileged: true
+    environment:
+      LOG_USERNAME:
+        from_secret: LOG_USERNAME
+      LOG_PASSWORD:
+        from_secret: LOG_PASSWORD
+      GIT_USERNAME:
+        from_secret: GIT_USERNAME
+      GIT_TOKEN:
+        from_secret: GIT_TOKEN
+      KS_PASS:
+        from_secret: KS_PASS
+      KEY_PASS:
+        from_secret: KEY_PASS
+    commands:
+      - sed -i "/qa/,/\}/ s/versionCode .*/versionCode $DRONE_BUILD_NUMBER/" build.gradle
+      - sed -i "/qa/,/\}/ s/versionName .*/versionName \"$DRONE_BUILD_NUMBER\"/" build.gradle
+      - ./gradlew assembleQaDebug
+      - /opt/android-sdk-linux/build-tools/*/apksigner 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
+      - scripts/uploadArtifact.sh $LOG_USERNAME $LOG_PASSWORD $DRONE_BUILD_NUMBER $DRONE_PULL_REQUEST $GIT_USERNAME $GIT_TOKEN
+
 trigger:
-    event:
-        - pull_request
+  event:
+    - pull_request
diff --git a/.editorconfig b/.editorconfig
index 8b0e9f1e6a..8aa4377dd2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,7 +3,7 @@
 # see http://EditorConfig.org
 
 # This is the file in the root of the project.
-# For sub folders you can have other files that override only some settings. 
+# For sub folders you can have other files that override only some settings.
 # For these, this settings should be false.
 root=true
 
@@ -22,7 +22,7 @@ trim_trailing_whitespace=true
 insert_final_newline=true
 
 [*.properties]
-# Exception for Java properties files should be encoded latin1 (aka iso8859-1) 
+# Exception for Java properties files should be encoded latin1 (aka iso8859-1)
 charset=latin1
 
 [*.{cmd,bat}]
@@ -31,3 +31,6 @@ end_of_line=crlf
 
 [*.md]
 trim_trailing_whitespace=false
+
+[.drone.yml]
+indent_size=2