From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 14 Jul 2021 08:27:11 +0000 (+0200)
Subject: Ignore android-* tags when using `git describe`
X-Git-Tag: android-2.3.3-1^0
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4ae9b482f2d3e89582d4c6761b3f73ffbf035f7f;p=thirdparty%2Fstrongswan.git

Ignore android-* tags when using `git describe`
---

diff --git a/scripts/git-version b/scripts/git-version
index f92d0718f4..86e413c0e0 100755
--- a/scripts/git-version
+++ b/scripts/git-version
@@ -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
diff --git a/scripts/test.sh b/scripts/test.sh
index 915b12d9b0..1c0efd6d7c 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -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 \
diff --git a/testing/scripts/build-strongswan b/testing/scripts/build-strongswan
index bfc1727773..4b2de3ffcb 100755
--- a/testing/scripts/build-strongswan
+++ b/testing/scripts/build-strongswan
@@ -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