Commit graph

35 commits

Author SHA1 Message Date
Salvador Cuñat
142c60ff88 smtk-import: Support SmartTrak import in travis builds
1.- Include needed dependencies (glib-2.0 and mdbtools) in .travis.yml
2.- Call smtk2ssrf-build.sh script *after* subsurface is done and
AppImage is built, as the script will override subsurface's binary.

Signed-off-by: Salvador Cuñat <salvador.cunat@gmail.com>
2018-02-24 13:42:01 -08:00
Dirk Hohndel
eb95cd02c1 Travis: try another work around
The previous hack got us to see that the error was a write error to
stdout and based on
https://github.com/travis-ci/travis-ci/issues/4704#issuecomment-321777557
setting filter_secrets: false will work around that issue.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-26 12:32:33 -08:00
Anton Lundin
063aadd166 android: Add android build on travis-ci
This adds a android-apk-build which runs on travis-ci. This is using a
quite ugly trick, building in a docker container, basically just to get
a newer cmake. The cmake in trusty is way to old to work with android
builds.

A good side-effect is that this is a complete copy-paste for anyone who
would like to build android-binaries them self on Linux. All the
uglyness is hidden away in a docker container.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-11-16 10:23:00 -08:00
Dirk Hohndel
9c3a45af95 Travis: add Mac build
This adds a -skip-googlemaps option to the build script since for some
reason trying to build the googlemaps plugin in the Travis mac
environment causes an error with a missing stack-protector-strong
feature.

The build relies on a custom build Qt and a cached homebrew environment.
And the result is of course not a DMG with a signed app but a zip file
with an unsigned app - so it's a bit harder to consume.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-14 21:39:15 -08:00
Dirk Hohndel
4d04f74312 Travis: also build an MXE/Windows installer
In the process, simplify our dependency a bit by no longer building
against libssh2 (we don't support ssh based authentication for git
on Windows) and libcurl (since it's proxy implementation doesn't appear
to actually work on Windows, anyway).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-11 17:48:57 -08:00
Dirk Hohndel
577bf57ddf Travis: avoid duplicated builds
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-10 10:55:01 -08:00
Dirk Hohndel
dd510fcea7 Travis: add missing dependency
This is a fairly big hammer to get the missing dependencies installed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-09 16:21:46 -08:00
Dirk Hohndel
38b2fea30f Travis: don't use relative directories
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-09 16:21:46 -08:00
Dirk Hohndel
01cea42705 Travis: move deployment into script
And no longer use the Travis deploy mechanism - uploadtool does it all.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-09 16:21:46 -08:00
Dirk Hohndel
35d5d7c8c7 Travis: move the before_install step into a script
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-09 16:21:46 -08:00
Dirk Hohndel
96a3dd0001 Travis: start restructuring the build process
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-09 16:21:46 -08:00
Simon Peter
20510d4ff7 Include git SHA as part of the AppImage filename
Closes #787

Signed-off-by: Simon Peter <probono@puredarwin.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-07 11:57:27 -08:00
Dirk Hohndel
3ab016bfda Travis AppImage: hide warning messages about GStreamer plugins
We don't use GStreamer and we really should try to build a QtWebKit
version without that dependency, but for now this should work to just
silence all these annoying warnings.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-06 15:50:19 -08:00
Dirk Hohndel
8307957a70 Travis: upload the AppImage.zsync file as well
This should allow incremental updates of the AppImage.
Unfortunately right now this requires on us not messing with the file
names - which means we are losing the SHA embedded there...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-06 14:05:37 -08:00
Dirk Hohndel
988d5bc1b8 Travis: fix typo
I hate it when I do that.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-06 09:47:18 -08:00
Dirk Hohndel
f24b6d461d Travis AppImage: work around OpenSSL issue
The Qt binaries that we use for the continues build of the AppImage reference
libcrypto.so.1.0.1e, but we bundle libcrypto.so.1.0.0. On distros that have
libcrypto.so.1.0.1e that gets loaded in addition to the one that we bundle
which causes a conflict. More details are explained in the issue below.

Fixes #779

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-06 09:42:07 -08:00
Dirk Hohndel
5196b46e99 Travis: upload continuous build AppImages as well
The latest is always under tag 'continuous'.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-05 21:29:35 -08:00
Dirk Hohndel
90ca1e351c Travis: automatically create AppImage for releases
This uploads the AppImage as Release whenever there's a new tag.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-05 20:07:55 -08:00
Dirk Hohndel
61dc1411ae Travis: add Grantlee plugins
With this we appear to have a fully functional AppImage.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-05 19:46:10 -08:00
Dirk Hohndel
f32b431a6d Travis: find the Qt plugins when running tests
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-05 19:37:23 -08:00
Dirk Hohndel
2f81a6927b Travis: get our own Qt and build with WebKit enabled
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-05 19:37:23 -08:00
Dirk Hohndel
a08fa138b8 Travis: remove special handling for MapWidget
Thanks to commit 956b45ddfd ("map-widget: move the widget and its resources to
'map-widget'") this is no longer needed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-05 14:50:20 -08:00
probonopd
cc4ca76ea0 Build AppImage on Travis CI
https://github.com/Subsurface-divelog/subsurface/issues/769
2017-11-05 14:49:14 -08:00
Dirk Hohndel
ea577aa8f2 Fix stupid syntax errors
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-10-16 05:27:30 -04:00
Dirk Hohndel
b5a5035c09 Make Travis test BT_SUPPORT off builds as well
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-10-15 21:50:54 -04:00
Dirk Hohndel
b4063de452 Travis: fix typo in '--platform' option
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-08-03 11:19:49 -07:00
Dirk Hohndel
a156e56266 Travis: switch to Qt 5.9.1
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-29 07:55:25 -07:00
Dirk Hohndel
3cd584e137 Travis: build without WebKit by default
All these hacks are no longer needed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-07-29 07:23:31 -07:00
Anton Lundin
d97055d47c Upgrade 3pp for android and testing
Signed-off-by: Anton Lundin <glance@acc.umu.se>
2017-06-21 18:43:15 -07:00
Anton Lundin
24f61e8b3d travis: Correct infrastructure for tests on mobile
In the previous code, there was a mistake in how cwd in travis works.
This solves that by just using make -C instead.

The only issue is that the tests currently fail.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-07 07:48:31 -08:00
Anton Lundin
40620aca0b travis: actually build the mobile version to
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-07 07:48:07 -08:00
Anton Lundin
9aacc41a48 travis: Run a xfvb for TestPreferences
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-07 07:48:00 -08:00
Dirk Hohndel
5018ad4748 On Travis, don't run TestPreferences
... because that one needs a display to run.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06 22:25:53 -08:00
Dirk Hohndel
2bad9bd57d Enable tests on Travis
Now that I disabled the failing parts of the TestParse, we should be
able to run this by default.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-06 22:10:13 -08:00
Anton Lundin
3ae9408a4c Add a travis build of subsurface
This runs a subsurface script/build.sh build in travis-ci, and runs the
tests afterwards.

The build runs on the Ubuntu Trusty image, but due to the fact that the
Qt shipped there is to old, it installs a Qt 5.8 from qt.io , and with
some trickery caches it.

Hacked out are things that doesn't build with Qt 5.8, and the rest is
built against WebEngine.

The tests currently fail, and I really don't know why, but its a clear
indication that they aren't run that often. This cam makes sure they are
run at least. The actual testing is just commented out for that reason.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-02-05 14:46:08 -08:00