From 06b8820c3b813b77ab69c64f66e7484e0fcc3775 Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Wed, 27 Feb 2019 13:52:11 -0800
Subject: [PATCH] drone build deploy android

---
 .drone.yml | 67 ++++++++++++++++++++++++------------------------------
 1 file changed, 30 insertions(+), 37 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 81cc5d2..cfdee53 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,43 +19,36 @@ pipeline:
       - qtdeploy build linux
       - export FILENAME=cwtch-linux-`date +%G-%m-%d-%H-%M`.tar.gz
       - tar -czf deploy/$FILENAME deploy/linux
-      - echo $BUILDFILES_KEY > /home/user/id_rsab64
-      - base64 -d /home/user/id_rsab64 > /home/user/id_rsa
-      - chmod 400 /home/user/id_rsa
-      - scp -o StrictHostKeyChecking=no -i /home/user/id_rsa deploy/$FILENAME buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/$FILENAME
-#  build-android:
-#    mem_limit: 3G
-#    image: therecipe/qt:android
-#    environment:
-#      - QT_DIR=/opt/Qt
-#      - QT_DOCKER='true'
-#      - QT_API=5.12.0
-#      - ANDROID_NDK_DIR=/home/user/android-ndk-r18b
-#      - ANDROID_SDK_DIR=/home/user/android-sdk-linux
-#    commands:
-#      - export GOPATH=$GOPATH:/media/sf_GOPATH1/
-#      - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
-#      - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git zip
-#      - find -iname 'moc*' | xargs rm
-#      - find -iname 'rcc*' | xargs rm
-#      - go get -d
-#      - qtdeploy build android
-#      - zip -r deploy/cwtch-android-`date +%G-%m-%d-%H-%M`.zip deploy/windows
-#deploy-buildfiles:
-#    image: appleboy/drone-scp:v1.3.0
-#    settings:
-#      host: openprivacy.ca
-#      username: buildfiles
-#      key: 
-#        from_secret: buildfiles_key
-#      source:
-#        - deploy/cwtch-* 
-#      target:
-#        - /home/buildfiles/buildfiles  
-#    when: 
-#      branch: master 
-#      event: push
-#      status: [ success ]
+  build-android:
+    mem_limit: 3G
+    image: therecipe/qt:android
+    environment:
+      - QT_DIR=/opt/Qt
+      - QT_DOCKER='true'
+      - QT_API=5.12.0
+      - ANDROID_NDK_DIR=/home/user/android-ndk-r18b
+      - ANDROID_SDK_DIR=/home/user/android-sdk-linux
+    commands:
+      - export GOPATH=$GOPATH:/media/sf_GOPATH1/
+      - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin
+      - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git zip
+      - find -iname 'moc*' | xargs rm
+      - find -iname 'rcc*' | xargs rm
+      - go get -d
+      - qtdeploy build android
+      - cp deploy/android/build-debug.apk deploy/cwtch-android-`date +%G-%m-%d-%H-%M`.apk
+  deploy-buildfiles:
+    image: pivotaldata/concourse-ssh
+    when: 
+      branch: master 
+      event: push
+      status: [ success ]
+    commands:
+      - 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/$FILENAME
+      - scp -o StrictHostKeyChecking=no -i ~/id_rsa deploy/*.apk buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/$FILENAME
   notify-email:
       image: drillster/drone-email
       host: build.openprivacy.ca