Ignore android-* tags when using `git describe`

diff --git a/scripts/git-version b/scripts/git-version
index f92d0718f46663d55b1cfd2830551fd3e8ab5eba..86e413c0e09f17065025c21574c11630ac9527d3 100755 (executable)
--- 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 915b12d9b0f32b6cf4d8c7642bd1097cf548e637..1c0efd6d7c1ced4700401dca6abd98732a8ac0f3 100755 (executable)
--- 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 bfc172777341cf2162cad0848e728406f7f802fb..4b2de3ffcbdfb91650840cf313365d1670b7f356 100755 (executable)
--- 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