From 87bf605f9216a838b0a1ea538447d08c9431f858 Mon Sep 17 00:00:00 2001 From: Example Date: Tue, 2 Apr 2024 21:44:12 +0530 Subject: [PATCH] fix: use Default .SemVer when git version tag property is not calculable --- apps/semver-yeasy/semver-yeasy.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/semver-yeasy/semver-yeasy.sh b/apps/semver-yeasy/semver-yeasy.sh index 05f0c80..f109320 100644 --- a/apps/semver-yeasy/semver-yeasy.sh +++ b/apps/semver-yeasy/semver-yeasy.sh @@ -96,7 +96,7 @@ calculate-version) GITVERSION_TAG_PROPERTY=${!GITVERSION_TAG_PROPERTY_NAME} if [ "${GITVERSION_TAG_PROPERTY}" == "" ]; then - GITVERSION_TAG_PROPERTY_NAME="GITVERSION_TAG_PROPERTY_DEFAULT" + GITVERSION_TAG_PROPERTY=${GITVERSION_TAG_PROPERTY_DEFAULT} fi service_version=$(echo "${gitversion_calc}" | ${JQ_EXEC_PATH} -r "[${GITVERSION_TAG_PROPERTY}] | join(\"\")") @@ -124,10 +124,11 @@ calculate-version) log "gitversion_calc=$($gitversion_calc_cmd 2>&1)" exit_status=$? log "Exit status: $exit_status" >> $GITHUB_OUTPUT - + GITVERSION_TAG_PROPERTY_NAME="GITVERSION_TAG_PROPERTY_$(echo "${DIFF_SOURCE}" | sed 's|/.*$||' | tr '[[:lower:]]' '[[:upper:]]')" + if [ "${GITVERSION_TAG_PROPERTY}" == "" ]; then - GITVERSION_TAG_PROPERTY_NAME="GITVERSION_TAG_PROPERTY_DEFAULT" + GITVERSION_TAG_PROPERTY=${GITVERSION_TAG_PROPERTY_DEFAULT} fi GITVERSION_TAG_PROPERTY=${!GITVERSION_TAG_PROPERTY_NAME} @@ -182,7 +183,7 @@ tag) GITVERSION_TAG_PROPERTY=${!GITVERSION_TAG_PROPERTY_NAME} if [ "${GITVERSION_TAG_PROPERTY}" == "" ]; then - GITVERSION_TAG_PROPERTY_NAME="GITVERSION_TAG_PROPERTY_DEFAULT" + GITVERSION_TAG_PROPERTY=${GITVERSION_TAG_PROPERTY_DEFAULT} fi service_version=$(echo "${gitversion_calc}" | ${JQ_EXEC_PATH} -r "[${GITVERSION_TAG_PROPERTY}] | join(\"\")") @@ -209,7 +210,7 @@ tag) GITVERSION_TAG_PROPERTY=${!GITVERSION_TAG_PROPERTY_NAME} if [ "${GITVERSION_TAG_PROPERTY}" == "" ]; then - GITVERSION_TAG_PROPERTY_NAME="GITVERSION_TAG_PROPERTY_DEFAULT" + GITVERSION_TAG_PROPERTY=${GITVERSION_TAG_PROPERTY_DEFAULT} fi service_version=$(echo "${gitversion_calc}" | ${JQ_EXEC_PATH} -r "[${GITVERSION_TAG_PROPERTY}] | join(\"\")")