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,40 +21,24 @@ 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:
+      branch:
+        - develop
       event:
         - push
-
-trigger:
-  branch:
-    - develop
-
----
-kind: pipeline
-type: docker
-name: build-master
-
-steps:
-  - name: build
-    image: node
-    commands:
-      - npm install
-      - npm run build
   - name: deploy
-    image: alpine
+      image: alpine
-    environment:
+      environment:
-      FTP_HOST:
+        FTP_HOST:
-        from_secret: FTP_HOST
+          from_secret: FTP_HOST
-      FTP_USERNAME:
+        FTP_USERNAME:
-        from_secret: FTP_USERNAME
+          from_secret: FTP_USERNAME
-      FTP_PASSWORD:
+        FTP_PASSWORD:
-        from_secret: FTP_PASSWORD
+          from_secret: FTP_PASSWORD
-    commands:
+      commands:
-      - which lftp || ( apk --update add lftp )
+        - 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
+        - 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:
+      when:
-      event:
+        branch:
-        - push
+          - master
-
+        event:
-trigger:
+          - push
-  branch:
-    - master