1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-10-25 03:42:48 +02:00
Commit Graph

14 Commits

Author SHA1 Message Date
Michael Schuster
d5b737ab4b
[stable-2.6] AppImage: Upgrade to Qt 5.12.8
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-06-09 04:06:06 +02:00
Dominique Fuchs
6cba316ab5
Updated AppImage instructions w/ new desktop file name
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>

(cherry picked from commit a8ecf486d1)

Solved conflicts while cherry-picking (2020-06-09):
- Modified to match with master's newer version, so we also don't need to
  cherry-pick 0c4c5c5f8b

Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-06-09 03:20:22 +02:00
Michael Schuster
a21ae444e3 Updater: Add CMake option BUILD_UPDATER to make the updater optional
- Default: BUILD_UPDATER = NO

  To ease builds for distro packages and contributors (regardless of the specified update URL)

- Enable updater build for Drone CI and AppImage builds

Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit e833e86da6)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-03-10 16:23:51 +01:00
Michael Schuster
85b4965d7f
Linux AppImage build script: Use QtKeyChain master
Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit a35aa58943)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-01-18 16:33:26 +01:00
Michael Schuster
cf0082f92f
Make AppImage upload optional and add timeout
Moves the upload into a separate Drone command and adds a timeout for curl
to fail after 15 minutes.

Returns zero to keep Drone from failing.

Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit 4fc8936553)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-11-17 02:17:00 +01:00
Michael Schuster
f4e129d4e2 Move .desktop file path to new env var to avoid duplicates
Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit dd0135ce2e)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-11-17 02:16:55 +01:00
Michael Schuster
ec6eaf2121 Upgrade for Qt 5.12.5 in docker-ci
- Use the new image: nextcloudci/client-5.12:client-5.12-5
- Use it's new QT_BASE_DIR: /opt/qt5.12.5

Signed-off-by: Michael Schuster <michael@schuster.ms>
(cherry picked from commit d830a1c5f7)
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-11-17 02:13:03 +01:00
Roeland Jago Douma
bb9017d3a6
Move over AppImage builder to 5.12
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-21 15:57:40 +01:00
Claas Augner
2344db8937 qtkeychain: 0.8.0 -> 0.9.1 2018-10-26 18:49:03 +02:00
Roeland Jago Douma
cd0b638a80
Add openssl 1.0 to appimage as Qt needs it
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-27 23:14:10 +02:00
Roeland Jago Douma
7ce9c22d2c
Build AppImage with Qt-5.11
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-26 17:49:00 +02:00
Roeland Jago Douma
2c5e559df6
Bundle NSS because else 💥
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-23 21:29:16 +02:00
Roeland Jago Douma
45eefb27cf
Bump AppImage Drone
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-28 20:04:42 +01:00
Roeland Jago Douma
be8b99bf3a
Build AppImage on all pushes
This allows quickly testing of the appimages for feedback

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-21 14:20:09 +01:00