Ignore android-* tags when using `git describe`
This commit is contained in:
parent
1aa68a78f8
commit
4ae9b482f2
|
@ -6,7 +6,7 @@ TARBALL=$SRCDIR/.tarball-git-version
|
|||
if test -f $TARBALL; then
|
||||
V=$(cat $TARBALL)
|
||||
elif test -d $SRCDIR/.git; then
|
||||
V=$(git -C $SRCDIR describe --tags HEAD 2>/dev/null)
|
||||
V=$(git -C $SRCDIR describe --exclude 'android-*' --tags HEAD 2>/dev/null)
|
||||
fi
|
||||
|
||||
if test -z "$V"; then
|
||||
|
|
|
@ -468,7 +468,7 @@ sonarcloud)
|
|||
-Dsonar.projectKey=${SONAR_PROJECT} \
|
||||
-Dsonar.organization=${SONAR_ORGANIZATION} \
|
||||
-Dsonar.login=${SONAR_TOKEN} \
|
||||
-Dsonar.projectVersion=$(git describe)+${BUILD_NUMBER} \
|
||||
-Dsonar.projectVersion=$(git describe --exclude 'android-*')+${BUILD_NUMBER} \
|
||||
-Dsonar.sources=. \
|
||||
-Dsonar.cfamily.threads=2 \
|
||||
-Dsonar.cfamily.cache.enabled=true \
|
||||
|
|
|
@ -143,7 +143,7 @@ if [ -z "$TARBALL" ]; then
|
|||
do_on_exit umount $LOOPDIR/root/strongswan
|
||||
|
||||
log_action "Determine strongSwan version"
|
||||
desc=`git -C $SWANDIR describe --dirty`
|
||||
desc=`git -C $SWANDIR describe --exclude 'android-*' --dirty`
|
||||
if [ $? -eq 0 ]; then
|
||||
version="$desc (`git -C $SWANDIR rev-parse --abbrev-ref HEAD`)"
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue