diff --git a/resources/com/cadoles/gitea/gitea-release.sh b/resources/com/cadoles/gitea/gitea-release.sh index 6b49848..ba5185b 100644 --- a/resources/com/cadoles/gitea/gitea-release.sh +++ b/resources/com/cadoles/gitea/gitea-release.sh @@ -7,6 +7,7 @@ GITEA_RELEASE_ORG=${GITEA_RELEASE_ORG} GITEA_RELEASE_BASE_URL=${GITEA_BASE_URL:-https://forge.cadoles.com} GITEA_RELEASE_USERNAME=${GITEA_RELEASE_USERNAME} GITEA_RELEASE_PASSWORD=${GITEA_RELEASE_PASSWORD} +GITEA_RELEASE_NAME=${GITEA_RELEASE_NAME} GITEA_RELEASE_VERSION=${GITEA_RELEASE_VERSION} GITEA_RELEASE_COMMITISH_TARGET=${GITEA_RELEASE_COMMITISH_TARGET} GITEA_RELEASE_IS_DRAFT=${GITEA_RELEASE_IS_DRAFT:-false} @@ -93,7 +94,7 @@ function create_release { payload=$(json_set "$payload" body "$GITEA_RELEASE_BODY" true) payload=$(json_set "$payload" draft $GITEA_RELEASE_IS_DRAFT) - payload=$(json_set "$payload" name "\"$GITEA_RELEASE_VERSION\"") + payload=$(json_set "$payload" name "\"${GITEA_RELEASE_NAME:-$GITEA_RELEASE_VERSION}\"") payload=$(json_set "$payload" prerelease $GITEA_RELEASE_IS_PRERELEASE) payload=$(json_set "$payload" tag_name "\"${GITEA_RELEASE_VERSION:-$GITEA_RELEASE_COMMITISH_TARGET}\"") payload=$(json_set "$payload" target_commitish "\"$GITEA_RELEASE_COMMITISH_TARGET\"") diff --git a/vars/gitea.groovy b/vars/gitea.groovy index 5f682e4..8a30e95 100644 --- a/vars/gitea.groovy +++ b/vars/gitea.groovy @@ -45,6 +45,7 @@ def release(String credentialsId, String org, String project, Map options = [:]) def baseUrl = options.get('baseUrl', 'https://forge.cadoles.com') def defaultVersion = sh(returnStdout: true, script: 'git describe --always').trim() def releaseVersion = options.get('releaseVersion', defaultVersion) + def releaseName = options.get('releaseName', releaseVersion) def commitishTarget = options.get('commitishTarget', env.GIT_COMMIT) def defaultIsPrerelease = true @@ -81,6 +82,7 @@ def release(String credentialsId, String org, String project, Map options = [:]) export GITEA_RELEASE_ORG="${org}" export GITEA_RELEASE_BASE_URL="${baseUrl}" export GITEA_RELEASE_VERSION="${releaseVersion}" + export GITEA_RELEASE_NAME="${releaseName}" export GITEA_RELEASE_COMMITISH_TARGET="${commitishTarget}" export GITEA_RELEASE_IS_DRAFT="${isDraft}" export GITEA_RELEASE_IS_PRERELEASE="${isPrerelease}"