Merge pull request #3853 from nextcloud/fixDrone

fix drone.yml for drone 1.0

.drone.yml

@@ -1,17 +1,38 @@
-pipeline:
+kind: pipeline
-    compile:
+name: generic
+
+steps:
+- name: generic
   image: nextcloudci/android:android-44
   commands:
-        # build app and assemble APK
+    - ./gradlew assembleGeneric
-        - sh -c "if [ '${FLAVOR}' != 'Analysis' ]; then ./gradlew assemble${FLAVOR}; fi"
-        when:
-            matrix:
-                FLAVOR: [Generic, Gplay]
 
-    test:
+trigger:
+  branch:
+    - master
+  event:
+    - pull_request
+    - push
+
+---
+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
@@ -21,22 +42,38 @@ pipeline:
     - ./gradlew combinedTestReport
     - curl -o codecov.sh https://codecov.io/bash
     - bash ./codecov.sh -t fc506ba4-33c3-43e4-a760-aada38c24fd5
-        secrets: [ LOG_USERNAME, LOG_PASSWORD, GIT_USERNAME, GIT_TOKEN ]
-        when:
-            matrix:
-                FLAVOR: Gplay
 
-    analysis:
+services:
+- name: server
+  image: nextcloudci/server:server-3
+
+trigger:
+  branch:
+    - master
+  event:
+   - 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
-        secrets: [ GIT_USERNAME, GIT_TOKEN, LOG_USERNAME, LOG_PASSWORD ]
-        when:
-            matrix:
-                FLAVOR: Analysis
 
-    notify:
+- name: notify
   image: drillster/drone-email
   host: $EMAIL_HOST
   port: 587
@@ -46,23 +83,26 @@ pipeline:
   skip_verify: true
   recipients_only: true
   recipients: [ $EMAIL_RECIPIENTS ]
-        secrets: [ EMAIL_USERNAME, EMAIL_PASSWORD, EMAIL_RECIPIENTS, EMAIL_HOST ]
+  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:
-            event: push
+    event:
-            status: failure
+      - push
-            branch: master
+    status:
+      - failure
+    branch:
+      - master
 
-matrix:
+trigger:
-    FLAVOR:
+  branch:
-    - Generic
+    - master
-    - Gplay
+  event:
-    - Analysis
+    - push
-
+    - pull_request
-services:
-    server:
-        image: nextcloudci/server:server-3
-        when:
-            matrix:
-                FLAVOR: Gplay
-
-branches: master