mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
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>
This commit is contained in:
parent
c609bc9446
commit
f252af1dd1
20 changed files with 20 additions and 20 deletions
|
|
@ -14,7 +14,7 @@ unset -f popd
|
|||
# Sorry Travis, fetching the whole thing and the tags as well...
|
||||
git fetch --unshallow
|
||||
git pull --tags
|
||||
git describe
|
||||
git describe --match "v[0-9]*"
|
||||
|
||||
git submodule init
|
||||
git submodule update --recursive
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ set -e
|
|||
# this gets executed by Travis when building for iOS
|
||||
# it gets started from inside the subsurface directory
|
||||
|
||||
GITVERSION=$(git describe --abbrev=12 | sed -e 's/-g.*$// ; s/^v//')
|
||||
GITVERSION=$(git describe --match "v[0-9]*" --abbrev=12 | sed -e 's/-g.*$// ; s/^v//')
|
||||
VERSION=$(echo $GITVERSION | sed -e 's/-/./')
|
||||
|
||||
echo "preparing dependencies for Subsurface-mobile ${VERSION} for iOS"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue