Merge branch 'princess' into fix/login-improvements

.drone.yml

@@ -11,11 +11,33 @@ steps:
 
   - name: package
     image: fuww/alpine-zip
+    when:
+      event:
+        - push
     commands:
       - SHORTREV=`echo $DRONE_COMMIT | cut -b 1-8`
-      - echo FILENAME=`date +%Y%m%d%H%m`-$SHORTREV.zip  >> environment
+      - echo NAME=`date +%Y%m%d%H%m`-$SHORTREV  >> environment
       - source environment
-      - zip -r $FILENAME build
+      - zip -r $NAME.zip build
+
+  - name: dev.carbon.chat
+    image: drillster/drone-rsync
+    when:
+      event:
+        - push
+    settings:
+      hosts: 
+        from_secret: SSH_HOST
+      port: 
+        from_secret: SSH_PORT
+      user:
+        from_secret: SSH_USERNAME
+      key:
+        from_secret: SSH_KEY
+      source: ./build/*
+      target: ${DRONE_COMMIT_SHA:0:8}
+      recursive: true
+
 
   - name: b2
     image: tianon/backblaze-b2:2
@@ -28,8 +50,9 @@ steps:
         from_secret: b2_account_id
       KEY: 
         from_secret: b2_application_key
+      COMMIT: ${DRONE_COMMIT_SHA:0:8}
     commands:
       - source environment
       - b2 authorize-account $ACCOUNT $KEY
-      - b2 upload-file $BUCKET $FILENAME $FILENAME
-      - echo Build artifacts avaliable at `b2 make-friendly-url $BUCKET $FILENAME`
+      - b2 upload-file $BUCKET $NAME.zip $NAME.zip
+      - echo Build artifacts avaliable at `b2 make-friendly-url $BUCKET $NAME.zip` and at https://dev.carbon.chat/$COMMIT