From 39e0c81f47c84ee8d68b5c35f6ae69d28b52d27d Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Sat, 23 Feb 2019 19:52:37 -0800 Subject: [PATCH 01/13] drone go get -d --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index cc42ec2..211835a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -17,7 +17,7 @@ pipeline: - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin - echo $PATH - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git - - go get + - go get -d - qtdeploy build linux build-android: image: therecipe/qt:android From 1361d9d12eff6a1154119de58f16f66ae04c864f Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Sat, 23 Feb 2019 20:06:10 -0800 Subject: [PATCH 02/13] drone build android --- .drone.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 211835a..38a6ab4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,17 +11,25 @@ pipeline: - QT_DOCKER='true' - QT_API=5.12.0 commands: - - echo $QT_DIR - export GOPATH=$GOPATH:/media/sf_GOPATH1/ - - echo $GOPATH - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin - echo $PATH - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git - go get -d - qtdeploy build linux build-android: + mem_limit: 3G image: therecipe/qt:android + environment: + - QT_DIR=/opt/Qt + - QT_DOCKER='true' + - QT_API=5.12.0 commands: + - export GOPATH=$GOPATH:/media/sf_GOPATH1/ + - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin + - echo $PATH + - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git + - go get -d - qtdeploy build android notify-email: image: drillster/drone-email From 466b55f8bc5991e38a92bdec2bf4da62f2296510 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Mon, 25 Feb 2019 11:47:48 -0800 Subject: [PATCH 03/13] drone - android : change base --- .drone.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 38a6ab4..ca34550 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ workspace: - base: /media/sf_GOPATH1/src - path: cwtch.im/ui + base: /media/sf_GOPATH1/src/cwtch.im + path: ui pipeline: build-linux: @@ -13,7 +13,6 @@ pipeline: commands: - export GOPATH=$GOPATH:/media/sf_GOPATH1/ - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin - - echo $PATH - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git - go get -d - qtdeploy build linux @@ -27,8 +26,9 @@ pipeline: commands: - export GOPATH=$GOPATH:/media/sf_GOPATH1/ - export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin - - echo $PATH - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git + - find -iname 'moc*' | xargs rm + - find -iname 'rcc*' | xargs rm - go get -d - qtdeploy build android notify-email: From e3c52e916fc8d6b00276fd2b893050247ade202e Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Mon, 25 Feb 2019 12:48:56 -0800 Subject: [PATCH 04/13] drone/ android env defs --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index ca34550..f64eb02 100644 --- a/.drone.yml +++ b/.drone.yml @@ -23,6 +23,8 @@ pipeline: - 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 From a7c769b49fd0c12a822c36b7e584c7114bb57bbe Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Tue, 26 Feb 2019 15:25:33 -0800 Subject: [PATCH 05/13] attempt to deploy files --- .drone.yml | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index f64eb02..c799354 100644 --- a/.drone.yml +++ b/.drone.yml @@ -16,23 +16,40 @@ pipeline: - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git - go get -d - qtdeploy build linux - 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 - - find -iname 'moc*' | xargs rm - - find -iname 'rcc*' | xargs rm - - go get -d - - qtdeploy build android + - tar -czf deploy/cwtch-linux-`date +%G-%m-%d-%H-%M`.tar.gz deploy/linux +# 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 ] notify-email: image: drillster/drone-email host: build.openprivacy.ca From 9c5d8c6df49f52755279132cd1cdd8a13dfefed3 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 27 Feb 2019 12:24:39 -0800 Subject: [PATCH 06/13] drone build steps push files --- .drone.yml | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index c799354..4dcf906 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,6 +6,7 @@ pipeline: build-linux: mem_limit: 3G image: therecipe/qt:linux + secrets: [buildfiles_key] environment: - QT_DIR=/opt/Qt - QT_DOCKER='true' @@ -13,10 +14,14 @@ pipeline: 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 + - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git openssh-client - go get -d - qtdeploy build linux - - tar -czf deploy/cwtch-linux-`date +%G-%m-%d-%H-%M`.tar.gz deploy/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_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 @@ -35,21 +40,21 @@ pipeline: # - 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 ] +#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 ] notify-email: image: drillster/drone-email host: build.openprivacy.ca From 741cb78b0ab8e54cee746fd4783ba378b6820003 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 27 Feb 2019 12:52:33 -0800 Subject: [PATCH 07/13] drone build steps push files --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4dcf906..221f1f7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -21,7 +21,8 @@ pipeline: - tar -czf deploy/$FILENAME deploy/linux - echo $BUILDFILES_KEY > /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 + - cat /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 From 0777bfa68cd6e7721b7bd931906f853afb0bce30 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 27 Feb 2019 13:27:06 -0800 Subject: [PATCH 08/13] drone base64 key --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 221f1f7..d071c9f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,8 @@ 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_rsa + - echo $BUILDFILES_KEY > /home/user/id_rsab64 + - base64 -d /home/user/id_rsab64 > /home/user/id_rsa - chmod 400 /home/user/id_rsa - cat /home/user/id_rsa - scp -o StrictHostKeyChecking=no -i /home/user/id_rsa deploy/$FILENAME buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/$FILENAME From e2147fbf6a67ce84d8910a16412b3f5e3192692e Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 27 Feb 2019 13:44:04 -0800 Subject: [PATCH 09/13] drone new key / no echo --- .drone.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index d071c9f..81cc5d2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -22,7 +22,6 @@ pipeline: - echo $BUILDFILES_KEY > /home/user/id_rsab64 - base64 -d /home/user/id_rsab64 > /home/user/id_rsa - chmod 400 /home/user/id_rsa - - cat /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 From 06b8820c3b813b77ab69c64f66e7484e0fcc3775 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 27 Feb 2019 13:52:11 -0800 Subject: [PATCH 10/13] 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 From baa0a71f45e21242bfa9e4cba6898be99a0bf6f9 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 27 Feb 2019 14:17:49 -0800 Subject: [PATCH 11/13] drone build step get secret --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index cfdee53..8cba76d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,6 @@ pipeline: build-linux: mem_limit: 3G image: therecipe/qt:linux - secrets: [buildfiles_key] environment: - QT_DIR=/opt/Qt - QT_DOCKER='true' @@ -39,6 +38,7 @@ pipeline: - cp deploy/android/build-debug.apk deploy/cwtch-android-`date +%G-%m-%d-%H-%M`.apk deploy-buildfiles: image: pivotaldata/concourse-ssh + secrets: [buildfiles_key] when: branch: master event: push From b2c9663564bc9e42fa17dbe345aa15d4afabc57f Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 27 Feb 2019 14:44:37 -0800 Subject: [PATCH 12/13] Add Back Button --- qml/panes/OverlayPane.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qml/panes/OverlayPane.qml b/qml/panes/OverlayPane.qml index afe5c46..0be6120 100644 --- a/qml/panes/OverlayPane.qml +++ b/qml/panes/OverlayPane.qml @@ -27,7 +27,7 @@ ColumnLayout { gcd.requestPeerSettings() } } - back.visible: false + back.visible: true } RowLayout { From c84d5eb6437c6d3e5acf1d9829c36f309971f672 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Sat, 2 Mar 2019 12:10:32 -0800 Subject: [PATCH 13/13] drone build windows --- .drone.yml | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8cba76d..9b22a7d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -30,12 +30,30 @@ pipeline: 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 + - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git - 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 + build-windows: + mem_limit: 3G + image: therecipe/qt:windows_64_shared + 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 windows + - zip -r deploy/cwtch-windows-`date +%G-%m-%d-%H-%M`.zip deploy/windows deploy-buildfiles: image: pivotaldata/concourse-ssh secrets: [buildfiles_key] @@ -47,8 +65,9 @@ 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/$FILENAME - - scp -o StrictHostKeyChecking=no -i ~/id_rsa deploy/*.apk buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/$FILENAME + - 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/ notify-email: image: drillster/drone-email host: build.openprivacy.ca