From 1dbf568c5675f51f6db81543cc0227fead9f89af Mon Sep 17 00:00:00 2001 From: nyyu Date: Mon, 21 Apr 2025 15:08:34 +0200 Subject: [PATCH] feat: tag version --- sonar.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sonar.sh b/sonar.sh index a893748..93a409e 100755 --- a/sonar.sh +++ b/sonar.sh @@ -16,14 +16,15 @@ if [[ -n "${CI_COMMIT_PULL_REQUEST}" ]]; then sonarOpts=(-Dsonar.pullrequest.key="${CI_COMMIT_PULL_REQUEST}" -Dsonar.pullrequest.branch="${CI_COMMIT_SOURCE_BRANCH}" -Dsonar.pullrequest.base="${CI_COMMIT_TARGET_BRANCH}") fi -version= - -if [[ -f "package.json" ]]; then - version=$(awk -F'"' '/"version": ".+"/ { print $4; exit; }' package.json) -elif [[ -f "Cargo.toml" ]]; then - version=$(awk -F'"' '/^version =/ { print $2; exit; }' Cargo.toml) -elif [[ -d "gradle" ]]; then - version=$(./gradlew --gradle-user-home /tmp/.gradle --project-cache-dir /tmp/.cachegradle properties -PbuildDir=/tmp/.buildgradle -q | awk '/^version:/ {print $2}') +version="${CI_COMMIT_TAG}" +if [[ -z "${version}" ]]; then + if [[ -f "package.json" ]]; then + version=$(awk -F'"' '/"version": ".+"/ { print $4; exit; }' package.json) + elif [[ -f "Cargo.toml" ]]; then + version=$(awk -F'"' '/^version =/ { print $2; exit; }' Cargo.toml) + elif [[ -d "gradle" ]]; then + version=$(./gradlew --gradle-user-home /tmp/.gradle --project-cache-dir /tmp/.cachegradle properties -PbuildDir=/tmp/.buildgradle -q | awk '/^version:/ {print $2}') + fi fi sonarOpts+=(-Dsonar.projectVersion="${version}")