Commit graph

20 commits

Author SHA1 Message Date
Dirk Hohndel
f252af1dd1 prevent the 'latest' tag from messing with our version
We need to use git describe in a way that only refers to vX.Y.Z style tags.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2023-12-07 04:00:32 -08:00
Dirk Hohndel
b40c8de35b build-system: remove Grantlee references from legacy scripts
I debated about this commit... we don't use these scripts any more, but it
seems like it would be worse to leave the Grantlee references in them. Yet of
course this is all no longer tested. Maybe it is time to delete the scripts
from the tree.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-10-08 12:19:39 -07:00
Dirk Hohndel
f0307abf50 Travis: move storage to a cheaper service
It's surprising how much money this ended up costing...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-05-19 14:14:37 -07:00
Dirk Hohndel
b68b42bd2f Travis: build macOS test against Qt 5.12.3
The .app.zip should once again run on any Mac (ignoring the security issue of
unsigned binaries). The Qt binaries in that archive include the jpeg and png
libraries that were missing in the Qt 5.11.1 binaries we used until now.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-05-19 14:14:37 -07:00
Rolf Eike Beer
17211acc53 remove obsolete workaround for libdivecomputer includes of libusb
This has been fixed in revision b1d434f0ea9a2958613da9bed32ff3ff3318065e there.

Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-09 09:51:55 -08:00
Dirk Hohndel
7a0e26609b Travis: use homebrew addon instead of doing it manually
This should make our mac builds on Travis faster.

This also switches to the latest xcode / VM image which helps speed things up
(less to update for Homebrew). It turned out that that app directories that we
were creating here didn't run for people, anyway, so why even bother with an
old image.

We still create / upload that image (simply in order to be able to peek into it
in case something goes wrong).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-12-22 23:13:44 -08:00
Dirk Hohndel
4a0beab2a4 Travis: build Subsurface-mobile on macOS
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-10-09 10:03:38 -07:00
Dirk Hohndel
dc68c3e7bd Travis: build export-html on Mac and Linux
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-09-09 19:52:14 -07:00
Dirk Hohndel
066e01f66d Travis: build macOS against Qt 5.11.1
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-09 15:23:49 -07:00
Dirk Hohndel
e928c829d3 Travis: install from Homebrew instead of using a cache
Clearly something has changed here. When I first tried to use Homebrew on
Travis the update would take often so long that the build would time out. Now
it is nice and fast. So instead of wasting time with the cache let's just use
Homebrew directly.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-09 15:23:49 -07:00
Dirk Hohndel
dce7e46766 Mac: don't try to copy libraries we got from Homebrew
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-19 21:22:31 -07:00
Dirk Hohndel
d15a0bc277 Fix typos
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-04-13 17:07:42 -07:00
Dirk Hohndel
a1cd2f2e7a Use our fork of uploadtool
And use the 'correct' URL to obtain the actual file.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-12-30 11:10:40 -08:00
Dirk Hohndel
79e3f69f48 Travis: Mac: enable googlemaps again
This should work now.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-24 17:00:29 -08:00
Dirk Hohndel
775d27e5ff Travis: Mac build prevent error out when not using libcurl/libssh2
This shouldn't be needed anymore since the Homebrew libgit2 is not linked
against libcurl and libssh2.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-24 16:58:55 -08:00
Dirk Hohndel
ad4ea65493 Travis: try to make sure failing builds fail
In some situations Travis CI doesn't seem to notice that a build failed and
give us a green check mark even though the build didn't succeed.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-24 16:58:55 -08:00
Dirk Hohndel
f691593e65 Switch back to upstream uploadtool
In commit e643589233 ("Travis: setup up the desired release message
right away") we temproarily switched to my fork of uploadtool to take
advantage of a new feature that I had implemented there. This has
already been merged upstream, so let's switch back to upstream.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-18 08:05:50 -08:00
Dirk Hohndel
e643589233 Travis: setup up the desired release message right away
Instead of using the default release message and then trying to fix it up
in the after_success section of one of the builds that we test, let's just
always use the message that we want, regardless which build finishes first.

This currently requires my fork of the uploadtool - the changes have been
submitted upstream and I hope they'll get merged there so we can switch
back to the upstream version of uploadtool.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-18 16:17:40 +01:00
Dirk Hohndel
cd9805904a Travis: include the symlink in the zip of Mac .app
Don't try to follow the (recursive) symlink.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-11-18 16:17:40 +01: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