From 35e35656cb46ad7bad75c7b971af87798ebc9f80 Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Mon, 4 Mar 2019 12:25:31 -0800
Subject: [PATCH] drone dated hashed dir

---
 .drone.yml | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d264e46..d9c2dc6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,7 +4,7 @@ workspace:
 
 pipeline:
   build-linux:
-    mem_limit: 3G
+    mem_limit: 2G
     image: therecipe/qt:linux
     environment:
       - QT_DIR=/opt/Qt
@@ -17,9 +17,12 @@ pipeline:
       - go get -d
       - qtdeploy build linux
       - export FILENAME=cwtch-linux-`date +%G-%m-%d-%H-%M`.tar.gz
-      - tar -czf deploy/$FILENAME deploy/linux
+      - cd deploy
+      - mv linux cwtch
+      - tar -czf $FILENAME cwtch
+      - rm -r cwtch
   build-android:
-    mem_limit: 3G
+    mem_limit: 2G
     image: therecipe/qt:android
     environment:
       - QT_DIR=/opt/Qt
@@ -37,7 +40,7 @@ pipeline:
       - qtdeploy build android
       - cp deploy/android/build-debug.apk deploy/cwtch-android-`date +%G-%m-%d-%H-%M`.apk
   build-windows:
-    mem_limit: 3G
+    mem_limit: 2G
     image: therecipe/qt:windows_64_shared
     environment:
       - QT_DIR=/opt/Qt
@@ -54,7 +57,10 @@ pipeline:
       - go get -d
       - qtdeploy build windows
       - cp windows/* deploy/windows
-      - zip -r deploy/cwtch-windows-`date +%G-%m-%d-%H-%M`.zip deploy/windows
+      - cd deploy
+      - mv windows cwtch
+      - zip -r cwtch-windows-`date +%G-%m-%d-%H-%M`.zip windows
+      - rm -r cwtch
   deploy-buildfiles:
     image: pivotaldata/concourse-ssh
     secrets: [buildfiles_key]
@@ -66,9 +72,11 @@ pipeline:
       - echo $BUILDFILES_KEY > ~/id_rsab64
       - base64 -d ~/id_rsab64 > ~/id_rsa
       - chmod 400 ~/id_rsa
-      - scp -o StrictHostKeyChecking=no -i ~/id_rsa deploy/*.tar.gz buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
-      - scp -o StrictHostKeyChecking=no -i ~/id_rsa deploy/*.apk buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
-      - scp -o StrictHostKeyChecking=no -i ~/id_rsa deploy/*.zip buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
+      - export DIR=`date +%G.%m.%d-%H.%M`-`git rev-parse --short HEAD`
+      - cd deploy
+      - mkdir $DIR
+      - mv cwtch* $DIR/
+      - scp -o StrictHostKeyChecking=no -i ~/id_rsa $DIR buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
   notify-email:
       image: drillster/drone-email
       host: build.openprivacy.ca