Merge pull request #3853 from nextcloud/fixDrone

fix drone.yml for drone 1.0

.drone.yml

@@ -1,68 +1,108 @@
-pipeline:
-    compile:
-        image: nextcloudci/android:android-44
-        commands:
-        # build app and assemble APK
-        - sh -c "if [ '${FLAVOR}' != 'Analysis' ]; then ./gradlew assemble${FLAVOR}; fi"
-        when:
-            matrix:
-                FLAVOR: [Generic, Gplay]
+kind: pipeline
+name: generic
 
-    test:
-        image: nextcloudci/android:android-44
-        privileged: true
-        commands:
-        - 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
-        secrets: [ LOG_USERNAME, LOG_PASSWORD, GIT_USERNAME, GIT_TOKEN ]
-        when:
-            matrix:
-                FLAVOR: Gplay
+steps:
+- name: generic
+  image: nextcloudci/android:android-44
+  commands:
+    - ./gradlew assembleGeneric
 
-    analysis:
-        image: nextcloudci/android:android-44
-        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
+trigger:
+  branch:
+    - master
+  event:
+    - pull_request
+    - push
 
-    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 ]
-        secrets: [ EMAIL_USERNAME, EMAIL_PASSWORD, EMAIL_RECIPIENTS, EMAIL_HOST ]
-        when:
-            event: push
-            status: failure
-            branch: master
+---
+kind: pipeline
+name: gplay
 
-matrix:
-    FLAVOR:
-    - Generic
-    - Gplay
-    - Analysis
+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
 
 services:
-    server:
-        image: nextcloudci/server:server-3
-        when:
-            matrix:
-                FLAVOR: Gplay
+- name: server
+  image: nextcloudci/server:server-3
 
-branches: master
+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
+
+- 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:
+    event:
+      - push
+    status:
+      - failure
+    branch:
+      - master
+
+trigger:
+  branch:
+    - master
+  event:
+    - push
+    - pull_request