Commit graph

173 commits

Author SHA1 Message Date
Kevin Ottens
a938e7d05f
Adjust the appimage script to the buildsystem changes
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-12-15 11:01:53 +01:00
István Váradi
3d9d5f2fe7 Handle the case when the release version differs from that in VERSION.cmake
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-11-30 15:33:34 +01:00
allexzander
0fdb423fe0 fix AppImage build by using v0.10.0 for qtkeychain
Signed-off-by: allexzander <blackslayer4@gmail.com>
2020-11-30 13:41:12 +02:00
Kevin Ottens
0e617d020f
Adjust AppImage build of QtKeychain to be found by cmake
Now that things are done in a more standard way, let's adjust the
AppImage build so that QtKeychain is picked up properly now that our
FindQt5Keychain.cmake file is gone.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-11-02 13:28:02 +01:00
István Váradi
cd303e313d Do not build for Eoan
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-08-21 18:54:56 +02:00
Kevin Ottens
14bfa5025f Make sure wget looks for the certificates at the right place
Might happen because we got too many copies of OpenSSL around

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-08-12 06:45:13 +00:00
Michael Schuster
6cc1aa723e
Update CI for Qt 5.12.9
Also remove the jq package installation from the AppImage build script because
the package is included in the new Docker image (see nextcloud/docker-ci#231).

Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-22 14:19:57 +02:00
Michael Schuster
b801a74281
Drone Upload: Fix if condition for master, in addition to #2213
Don't try to comment on master (old condition was from a previous version of the script).

Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-21 01:20:19 +02:00
Michael Schuster
c3f5a9b9cc
Drone: Upload AppImage to GitHub using nextcloud-desktop-bot
Uploading AppImage's to transfer.sh often fail and cause the CI to wait for
the 15 minutes timeout.

This new approach uses a bot user to create releases in a dedicated ci-builds
repository. Each PR (or master) will get a dedicated release with the AppImage
supplied as a release asset. Older assets will be deleted prior uploading the
recent build.

The bot will then (in case of a PR) create a comment in the PR, containing the
download link.

Home of the CI releases: https://github.com/nextcloud-desktop-bot/ci-builds/releases

Inspired by: https://github.com/nextcloud/android/blob/master/scripts/uploadArtifact.sh

Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-07-20 17:11:33 +02:00
István Váradi
69a37e10ce Fetch tags for Debian build
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-07-11 17:39:17 +02:00
Kevin Ottens
7f7dd6bc76 Upgrade to the latest client image
Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-05-27 16:43:24 +02:00
István Váradi
81682b4cbe Do not build master for distributions without Qt 5.12
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-05-21 21:01:57 +02:00
Kevin Ottens
cd5db46036 Remove now unused files
Those files all refer to Qt version older than 5.12, also they seemed
unused for a while now.

Signed-off-by: Kevin Ottens <kevin.ottens@nextcloud.com>
2020-05-19 19:43:35 +02:00
István Váradi
697d303259 Do not build for Xenial anymore.
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-05-08 19:47:43 +02:00
István Váradi
4f3ea3ae66 Remove unnecessary Debian build files
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-05-04 16:40:26 +02:00
István Váradi
230b2f3781 Add Groovy build
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-04-27 19:20:40 +02:00
István Váradi
46c1d7f298 Allow specifying the base commit and version in the configuration file
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-04-27 19:20:30 +02:00
István Váradi
7b2de328a2 Change Debian build to the new more Debian-y way
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-04-27 19:19:04 +02:00
István Váradi
47824c104e
Merge pull request #1895 from ivaradi/debian-version
Debian versioning updates
2020-04-27 17:00:37 +02:00
István Váradi
8345d47cc5 Add Groovy-specific files
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-04-26 10:08:58 +02:00
István Váradi
b389eed6b0 Remove Ubuntu Disco, add Groovy
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-04-26 08:40:37 +02:00
István Váradi
5d2e99d15c Generate alpha, beta and stable versions
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-03-24 19:06:16 +01:00
István Váradi
19a58ed9c8 Generate more unique and ordered version numbers for Debian builds
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-03-24 19:06:07 +01:00
István Váradi
8ee6b0dab2 Provide specific install file for Debian oldstable
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-03-12 07:53:00 +01:00
Michael Schuster
e833e86da6 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>
2020-03-09 02:34:55 +01:00
Michael Schuster
275fe95895
Merge pull request #1834 from cclauss/python3-issues
Use print() function in both Python 2 and Python 3
2020-03-06 02:55:17 +01:00
István Váradi
9a23210e59 Added Focal-specific files
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-03-05 14:37:41 +01:00
cclauss
b34ed01109 Use print() function in both Python 2 and Python 3
Signed-off-by: cclauss <cclauss@me.com>
2020-03-05 11:35:30 +01:00
István Váradi
744d527300 Added build for Focal
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2020-03-04 20:47:03 +01:00
István Váradi
56a7a68de3 Do not install files related to cloud providers under Xenial
Signed-off-by: István Váradi <Istvan.Varadi@ericsson.com>
2020-01-31 08:41:11 +01:00
Corentin Noël
31d55c5c4e
Merge pull request #1729 from nextcloud/tintou/cloud-providers-debian-install
Install libcloudproviders files by default on debian
2020-01-30 21:09:55 +01:00
Dominique Fuchs
35f8103b40 Testing fix for qmldir import with linuxdeployqt AppImage by correcting source path
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2020-01-19 09:10:59 +01:00
Michael Schuster
7136d92011
Linux AppImage build script: Add QML dir for new 2.7 Tray menu
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-01-18 16:31:48 +01:00
Michael Schuster
a35aa58943
Linux AppImage build script: Use QtKeyChain master
Signed-off-by: Michael Schuster <michael@schuster.ms>
2020-01-18 16:31:22 +01:00
Corentin Noël
1e2a9a322b Install libcloudproviders files by default on debian
Signed-off-by: Corentin Noël <corentin@elementary.io>
2020-01-15 17:32:40 +01:00
István Váradi
2fc76c2b24 Build for Debian stable and oldstable
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-11-26 16:20:11 +01:00
Michael Schuster
801098f546
Fix dir in upload script
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-11-16 21:53:25 +01:00
Michael Schuster
4fc8936553
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>
2019-11-16 21:36:59 +01:00
Michael Schuster
dd0135ce2e
Move .desktop file path to new env var to avoid duplicates
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-11-16 21:34:13 +01:00
Michael Schuster
d830a1c5f7
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>
2019-11-16 21:31:07 +01:00
Michael Schuster
9e8498ad4e
Revert "Remove HTTP/2 support from Xenial" 2019-11-14 02:22:01 +01:00
István Váradi
a143b42c2a Remove HTTP/2 support from Xenial
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-11-05 19:34:32 +01:00
Michael Schuster
e54f127a06
Merge branch 'master' into lnx-domainname-desktopfiles 2019-10-27 17:30:48 +01:00
István Váradi
805b85a4d7 Add libdbus-1-dev to the build dependencies
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-10-20 10:23:49 +02:00
Dominique Fuchs
f3ab9d5fef
Merge branch 'master' into master 2019-10-05 10:35:59 +02:00
Corentin Noël
04dd02c295 Build with libcloudproviders on debian and in the AppImage
Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
2019-10-03 10:33:46 +02:00
István Váradi
37f74291b5 Remove kdelibs5-dev from the build dependencies for Eoan
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-10-02 20:04:23 +02:00
Dominique Fuchs
0c4c5c5f8b Fixed typo / double suffix
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-30 10:59:59 +02:00
Dominique Fuchs
3ad1c0e7a8 Created wrapper variable LINUX_APPLICATION_ID to clean up code
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-30 09:45:41 +02:00
Dominique Fuchs
a8ecf486d1 Updated AppImage instructions w/ new desktop file name
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
2019-09-26 21:01:01 +02:00
Michael Schuster
8b2c47cdcb
Remove old Qt 5.5 patch for Xenial
Signed-off-by: Michael Schuster <michael@schuster.ms>
2019-09-06 17:05:18 +02:00
István Váradi
1883c04a12 Remove dependency on libgnome-keyring0 on Eoan
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-08-09 06:47:59 +02:00
István Váradi
40753860cf
Merge branch 'master' into ubuntu-eoan 2019-07-30 06:50:19 +02:00
István Váradi
04d825f4b6 Remove Ubuntu Cosmic and add Eoan package
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-07-27 11:21:39 +02:00
István Váradi
2d2c1ef29e Update Qt 5.5 compatibility patch for Xenial
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-07-26 21:08:23 +02:00
István Váradi
d6ab7920d9 Fix the Debian changelog generator
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-07-25 16:48:24 +02: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
István Váradi
20b9404539 Support Ubuntu Disco Dingo 2018-12-05 19:46:45 +01:00
István Váradi
f0b96445d2 Fixed the PPA names as well 2018-11-13 20:49:26 +01:00
István Váradi
bcb4b44c69 Also use the correct OBS repository 2018-11-13 16:47:06 +01:00
István Váradi
82f9ec78dc Use the version kind to differentiate between target repos 2018-11-13 16:44:20 +01:00
István Váradi
5a26e7dabe Use the tags to determine if a version is a release or a beta one 2018-11-13 16:42:42 +01:00
István Váradi
ea806a1287 Patch for Xenial to be able to compile with Qt 5.5 2018-11-04 17:28:13 +01:00
Claas Augner
2344db8937 qtkeychain: 0.8.0 -> 0.9.1 2018-10-26 18:49:03 +02:00
István Váradi
fc6e6149e5 Require libssl 1.1 on distributions other than Xenial 2018-08-13 16:24:44 +02:00
István Váradi
13e2bb099b Require libssl 1.0 on Xenial 2018-08-13 16:24:18 +02:00
István Váradi
be3640dc51 Depend on libqt5svg5-dev 2018-07-31 16:24:16 +02:00
István Váradi
343402740f Make the Bionic control file the default one 2018-07-31 16:22:02 +02:00
István Váradi
1364755141 Use libkf5kio-dev directly on Bionic and Cosmic 2018-07-31 16:21:03 +02:00
Roeland Jago Douma
30a4f1edd7
Merge pull request #510 from ivaradi/beta-ppa
Use the beta PPA for builds (re #402)
2018-07-30 20:34:05 +02:00
István Váradi
d63bcb4d4b Use the beta PPA for builds (re #402) 2018-07-26 20:19:18 +02:00
István Váradi
dd9e12fe43 Start building for cosmic 2018-07-26 20:08:48 +02:00
István Váradi
8e92f87694 Stop building for artful 2018-07-26 20:07:36 +02:00
István Váradi
df9cc8396a Add a dependency on libgnome-keyring0 on Bionic 2018-07-22 20:33:45 +02:00
István Váradi
dec5473eec
The version is also read from the VERSION.cmake file 2018-07-03 09:11:31 +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
4ddbb35d77
Fix debian patch
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-06-05 13:29:51 +02:00
István Váradi
92de0770bc Re-encoded Ubuntu/Debian upload keys 2018-06-05 08:34:41 +02:00
István Váradi
76c4b05270 Patch the OSX CMakeLists.txt for Xenial 2018-05-22 07:04:09 +02:00
István Váradi
a602df065e Fixed the name of the Qt WebEngine package 2018-05-06 17:12:17 +02:00
István Váradi
fee2872a98 Added build dependency on qt5webengine-dev 2018-05-06 09:53:49 +02:00
István Váradi
7827fe4151 Fix Debian build 2018-05-03 19:02:49 +02:00
Roeland Jago Douma
4c40789dca
Merge pull request #140 from nextcloud/appimage_drone_bump
Bump AppImage Drone
2018-03-23 15:36:33 +01:00
Daniel Hansson
eec728eab8
Merge pull request #196 from ivaradi/master
Recommends relation to libgnome-keyring0
2018-02-24 21:46:09 +01:00
István Váradi
99add9f00d Recommend libgnome-keyring0 on Debian too 2018-02-24 10:33:19 +01:00
István Váradi
0b3129f366 Added a Recommends relation to libgnome-keyring0 2018-02-24 10:19:01 +01:00
István Váradi
2cc670453a A separate Dolphin client install file is not required for Bionic 2018-02-08 17:19:13 +01:00
István Váradi
22153cf912 KDE_INSTALL_USE_QT_SYS_PATHS turned on so that the plugin is installed to the correct directory on Xenial too 2018-02-08 17:18:18 +01:00
István Váradi
b11661f4c0 Reinstated the check for being on the master branch to enable uploading the packages 2018-02-02 18:57:51 +01:00
István Váradi
4c74f29b5f Removed yakkety and zesty, added bionic 2018-02-01 20:07:40 +01:00
István Váradi
549abc8c90 Build Xenial with Qt 5.5 2018-02-01 20:06:18 +01:00
István Váradi
ed9509f31f Merge branch 'master' into debian-build 2018-02-01 18:44:55 +01:00
István Váradi
d0896f0c82 Removed some debug printouts and dead code and added Bionic in place of Zesty 2018-01-31 20:04:33 +01:00
István Váradi
4d396c645e Why does Drone sometimes not use the new changes? 2018-01-31 19:58:24 +01:00
István Váradi
ebaae773f6 Trying a different strategy to sign the package files 2018-01-31 19:53:50 +01:00
István Váradi
11a540114e Hiding the keys from the output 2018-01-30 19:22:26 +01: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
István Váradi
72f629a7dc Added secrets to .drone.yml 2018-01-27 08:50:28 +01:00