Merge remote-tracking branch 'origin/develop' into develop

.drone.yml

@@ -1,6 +1,6 @@
 kind: pipeline
 type: docker
-name: build-develop
+name: default
 
 steps:
   - name: build
@@ -21,24 +21,10 @@ steps:
       - which lftp || ( apk --update add lftp )
       - lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ dev.sp-codes.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST
     when:
-      event:
-        - push
-
-trigger:
       branch:
         - develop
-
----
-kind: pipeline
-type: docker
-name: build-master
-
-steps:
-  - name: build
-    image: node
-    commands:
-      - npm install
-      - npm run build
+      event:
+        - push
   - name: deploy
       image: alpine
       environment:
@@ -52,9 +38,7 @@ steps:
         - which lftp || ( apk --update add lftp )
         - lftp -e "set ftp:ssl-force true; set ssl:verify-certificate no; mirror -R ./dist/ sp-codes.de/; bye" -u $FTP_USERNAME,$FTP_PASSWORD $FTP_HOST
       when:
-      event:
-        - push
-
-trigger:
         branch:
           - master
+        event:
+          - push