Merge branch 'trunk' into groups

.drone.yml

@@ -180,19 +180,20 @@ steps:
       - dir
       - dir deploy
   - name: deploy-windows
-    image: openpriv/docker-scp:1
+    #image: openpriv/flutter-desktop:windows-dev
+    image:  openpriv/pscp:latest
     when: 
         event: push
         status: [ success ]
-    #environment:
-    #  BUILDFILES_KEY:
-    #    from_secret: buildfiles_key_txt
+    environment:
+      BUILDFILES_KEY:
+        from_secret: buildfiles_key_txt
     commands:
       - echo "hello"
       - dir
-     # - echo $Env:BUILDFILES_KEY > id_rsa
-     # - dir
-      - pscp -r -o StrictHostKeyChecking=no -i id_rsa deploy\\* buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
+      - echo $Env:BUILDFILES_KEY > id_rsa
+      - dir
+      - C:\\bin\\pscp -P 22 -r -batch -i id_rsa deploy\\* buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
 
 trigger:
   repo: flutter/flutter_app