diff --git a/.drone.yml b/.drone.yml index cc42ec2..9b22a7d 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: @@ -11,18 +11,63 @@ 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 + - apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git openssh-client + - go get -d - qtdeploy build linux + - export FILENAME=cwtch-linux-`date +%G-%m-%d-%H-%M`.tar.gz + - tar -czf deploy/$FILENAME 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 + - 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] + 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/ + - 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 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 {