agentofuser
/
ui
forked from cwtch.im/ui
1
0
Fork 0
Code Releases Wiki Activity

Merge branch 'master' of https://git.openprivacy.ca/cwtch.im/ui

This commit is contained in:
Dan Ballard 2019-03-02 16:29:49 -08:00
parent eb50e36849 c84d5eb643
commit c756c6d2c7
2 changed files with 53 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
.drone.yml
View File

@ -1,6 +1,6 @@
workspace: workspace:
base: /media/sf_GOPATH1/src base: /media/sf_GOPATH1/src/cwtch.im
path: cwtch.im/ui path: ui
pipeline: pipeline:
build-linux: build-linux:
@ -11,18 +11,63 @@ pipeline:
- QT_DOCKER='true' - QT_DOCKER='true'
- QT_API=5.12.0 - QT_API=5.12.0
commands: commands:
- echo $QT_DIR
- export GOPATH=$GOPATH:/media/sf_GOPATH1/ - export GOPATH=$GOPATH:/media/sf_GOPATH1/
- echo $GOPATH
- export PATH=$PATH:/home/user/work/bin:/media/sf_GOPATH1/bin - 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 openssh-client
- apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl git - go get -d
- go get
- qtdeploy build linux - qtdeploy build linux
- export FILENAME=cwtch-linux-`date +%G-%m-%d-%H-%M`.tar.gz
- tar -czf deploy/$FILENAME deploy/linux
build-android: build-android:
mem_limit: 3G
image: therecipe/qt:android 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: 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 - 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: notify-email:
image: drillster/drone-email image: drillster/drone-email
host: build.openprivacy.ca host: build.openprivacy.ca

2
qml/panes/OverlayPane.qml
View File

@ -27,7 +27,7 @@ ColumnLayout {
gcd.requestPeerSettings() gcd.requestPeerSettings()
} }
} }
back.visible: false back.visible: true
} }
RowLayout { RowLayout {