Commit graph

119 commits

Author SHA1 Message Date
=Michael Keller
6fc8310705 CICD: Improve Workflows.
Make multiple improvements to the existing workflows:
- create a shared custom action to deal with version number tracking
  and generation;
- use this action to add the branch name to the version for pull
  request builds;
- create a shared workflow for all debian-ish builds to avoid re-use
  by copy / paste;
- remove potential security risks by eliminating the use of
  pre-evaluated expressions (`${{ ... }}`) inside scripts;
- update outdated GitHub action versions;
- improve the consistency by renaming scripts acording to have a `.sh`
  extension;
- improve naming of generated artefacts for pull requests to include
  the correct version.

@dirkh: Unfortunately this is potentially going to break builds when it is
merged, as there is no good way to 'test' a merge build short of
merging.
We'll just have to deal with the fallout of it in a follow-up pull
request.

Signed-off-by: Michael Keller <github@ike.ch>
2024-05-13 10:19:59 +12:00
Dirk Hohndel
62477d8c65 Complete redesign of Subsurface version numbers
- for now all versions start with v6.0
- CICD builds use the monolithic build number as patch level, e.g. v6.0.12345
- local builds use the following algorithm
  - find the newest commit with a CICD build number that is included in the
    working tree
  - count the number of commits in the working tree since that commit
  - if there are no commits since the last CICD build, the local build version
    will be v6.0.12345-local
  - if there are N commits since the last CICD build, it will be
    v6.0.12345-N-local
- test builds in the CICD that don't create artifacts simply use a dummy release
  in order to not incorrectly increment the build number and also not to waste
  time and resources by manually checking out the nightly-build repo for each of
  these builds.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2024-01-06 10:55:24 -08:00
Dirk Hohndel
58fb49f243 retire the mobile version
Both Subsurface and Subsurface-mobile will share the same version number moving
forward.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2024-01-06 10:55:24 -08:00
Dirk Hohndel
bb3ddf521b mobile: update version to 3.4.8
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-09-19 09:18:34 -07:00
Dirk Hohndel
d257a623fa mobile: update version to 3.4.7
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-08-28 19:51:03 -07:00
Dirk Hohndel
8a9359a03c mobile: update version to 3.4.6
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-07-31 12:12:02 -07:00
Dirk Hohndel
4bac5dbb66 build-system: allow adaptive building without WebKit
This should avoid build failures on platforms where we don't know if
QtWebKit will be available or not.

The options for printing and user manual are awkward to work with. This
all needs to be cleaned up at some point. Right.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-07-07 10:19:22 -07:00
Dirk Hohndel
49f69947e3 mobile: update version to 3.4.5
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-06-13 03:40:00 +00:00
Dirk Hohndel
56e02dbcc0 mobile: update version to 3.4.4
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-03-16 14:41:20 -07:00
Dirk Hohndel
39857ff717 macOS: remove unused Info.plist
This was confusing - the file in packaging macos hasn't been used since we
switched to building with cmake something like seven years ago.
Also add missing keys to the actual Info.plist skeleton.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-03-12 08:28:32 -08:00
Dirk Hohndel
f1740358a7 mobile: update version to 3.4.3
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2022-01-27 09:23:25 -08:00
Dirk Hohndel
840f273ade mobile: update version to 3.4.2
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-12-17 09:22:45 -08:00
Dirk Hohndel
da2ee24121 mobile: update version to 3.4.1
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-11-12 15:21:47 -08:00
Dirk Hohndel
ff694af92b build-system: prevent recursive symbolic links
If cmake is called multiple times we can end up with a recursive set of
symbolic links that can confuse package build scripts.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-10-19 12:19:18 -07:00
Dirk Hohndel
c2a9da89cc mobile: update version to 3.4.0
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-10-18 19:59:52 +00:00
Dirk Hohndel
836111da98 mobile: update version to 3.3.1
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-09-02 12:42:39 -07:00
Dirk Hohndel
edce243147 mobile: update version to 3.3.0
New minor numbers are always arbitrary...

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-08-18 19:09:59 -07:00
Dirk Hohndel
15c524804a mobile: update version to 3.2.1
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-07-28 07:57:16 -07:00
Dirk Hohndel
7c93624c41 mobile: update version to 3.2.1
I should do this right after pushing a release for mobile.
2021-06-30 10:55:21 -07:00
Dirk Hohndel
f9569cac7c mobile: update version to 3.2.0
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-03-24 10:01:00 -07:00
Dirk Hohndel
714ebfe826 mobile: update version to 3.1.3
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2021-01-01 12:38:50 -08:00
Dirk Hohndel
73aea74161 mobile: update version to 3.1.2
The iOS store enforces that every binary needs a new number.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-12-23 09:44:39 -08:00
Dirk Hohndel
856a0d36f5 mobile: update version to 3.1.1
3.1.0 was never released, but this is a quick hack to work around a versioning
issue in the iOS app store. Not ideal, but at least it works.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-12-17 09:17:54 -08:00
Dirk Hohndel
9909cbd273 mobile: update version to 3.1.0
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-11-19 17:18:33 -08:00
Dirk Hohndel
7f896ee8d5 build-system: remove building Grantlee cmake
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-10-08 12:19:39 -07:00
Dirk Hohndel
6835f03bae mobile: update version to 3.0.16
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-09-28 10:24:08 -07:00
Dirk Hohndel
4998052a78 mobile: update version to 3.0.15
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-09-17 11:19:56 -07:00
Dirk Hohndel
fc128359bc mobile: update version to 3.0.14
Once again I have managed to get out of sync in numbering between iOS
and Android. I'll make new releases with the correct version number on
both platforms today.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-09-12 11:11:56 -07:00
Dirk Hohndel
2c878ea6b6 mobile: update version to 3.0.13
Quite a few little changes lately that all deserve a new nobile app
release, and each release requires an updated version number.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-08-18 13:23:35 -07:00
Dirk Hohndel
9ae2a8bf7a mobile: update version to 3.0.12
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-08-16 16:40:28 -07:00
Dirk Hohndel
6a706a7000 mobile: update version to 3.0.11
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-07-29 07:56:21 -07:00
Dirk Hohndel
693aeadf3c mobile: update version to 3.0.10
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-07-11 12:17:46 -07:00
Dirk Hohndel
2babed6c84 mobile: update version to 3.0.9
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-06-08 12:29:16 -07:00
Dirk Hohndel
eb455fe0d2 mobile: update version to 3.0.8
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-05-30 11:20:58 -07:00
Dirk Hohndel
c0ab7cad2f mobile: update version to 3.0.7
Required by the app stores after a release.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-05-17 13:55:47 -07:00
Dirk Hohndel
2a31203221 mobile: update version to 3.0.6
This is needed to be able to push new betas into the AppStores.
I keep forgetting to do that after I do a mobile release.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-05-03 08:40:05 -07:00
Dirk Hohndel
00c8c1660b mobile: update version to 3.0.5
I keep forgetting to do that right after a release.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-04-18 17:38:09 -07:00
Dirk Hohndel
2a3a688d56 mobile: update version to 3.0.4
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-04-13 09:25:49 -07:00
Dirk Hohndel
969b587e3d Next mobile version increment
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-04-04 12:00:24 -07:00
Dirk Hohndel
c233803d4f Increment mobile version
That's needed to be able to push out new binaries to the stores.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-30 09:16:55 -07:00
Dirk Hohndel
d482108f8c Increment mobile version
That's needed to be able to push out new binaries to the stores.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-28 11:00:54 -07:00
Dirk Hohndel
91a97e09e5 Update Subsurface-mobile version
I believe this deserves a major version number increment.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-03-16 07:58:20 -07:00
Dirk Hohndel
636af40897 mobile: increment version number
In order to be able to roll out new betas, we need to first increment the
version number. Given the magnitude of the changes, incrementing the minor
version (not that we have ever been really consistent with how we do the
numbering in the first place).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-01-30 19:51:50 +02:00
Dirk Hohndel
68a752ec19 Mobile: update version number before next release
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-13 11:32:27 -07:00
Dirk Hohndel
94b8d4070f Mobile: update version to 2.2.2
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-10-02 08:04:49 -07:00
Dirk Hohndel
947b091553 Mobile: update version to 2.2.1
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-09-21 15:13:10 -07:00
Anton Lundin
6f9c8ea1b7 Find Qt5WebKitWidgets path and use it
When building and installing Qt5WebKitWidgets to a different path than
your other qt libraries, you need to actually look for it and find it to
be able to use it.

Signed-off-by: Anton Lundin <glance@acc.umu.se>
2019-09-11 17:21:50 +01:00
Dirk Hohndel
18c80d1cf0 Update Subsurface-mobile version number
The mobile changes are far and few, but the next version will be the
first to support arm64, so a new minor number seems appropriate.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-07-13 20:41:42 -07:00
Rolf Eike Beer
3b3306c552 CMake: clean up hints for finding libraries
HINTS should be dynamically introspected, static entries should be in PATHS.
There is also a platform dependent list of things where CMake always looks if
not explicitely forbidden, so remove any entries that are usually in those
default lists.

Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-21 19:30:14 -07:00
Rolf Eike Beer
c1f88ddd69 CMake: simplify code in HandleFindGit2
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
2019-03-21 19:30:14 -07:00