diff --git a/NodeApp/.gitlab-ci/01_functions.yml b/NodeApp/.gitlab-ci/01_functions.yml index 4d109b057c20474348fb2e47c901f6d867db8dca..08bddf31c6f3805135cc0916127343ea14a726bc 100644 --- a/NodeApp/.gitlab-ci/01_functions.yml +++ b/NodeApp/.gitlab-ci/01_functions.yml @@ -151,8 +151,8 @@ # Create Release (can't be done by release_step of gitlab image because it don't have access to env var defined in script_step) - > - RELEASE_DATA=$(jq --null-input --arg version "$VERSION" --arg description "# Changelog $DESCRIPTION" --arg tag_name "$VERSION" --arg ref "$CI_COMMIT_SHORT_SHA" '{ - "name": $version, + RELEASE_DATA=$(jq --null-input --arg version "$VERSION" --arg description "# Changelog (version $VERSION) $DESCRIPTION" --arg tag_name "$RELEASE_NAME" --arg ref "$CI_COMMIT_SHORT_SHA" '{ + "name": $tag_name, "description": $description, "tag_name": $tag_name, "ref": $ref, diff --git a/NodeApp/.gitlab-ci/10_stageRelease.yml b/NodeApp/.gitlab-ci/10_stageRelease.yml index 7846a3880336a64de2ef4c07cf7f592da1274f24..ab82f3e2ec96fbaecc6accc1d71f045604d5e4ef 100644 --- a/NodeApp/.gitlab-ci/10_stageRelease.yml +++ b/NodeApp/.gitlab-ci/10_stageRelease.yml @@ -53,6 +53,7 @@ release:gitlab: image: registry.gitlab.com/gitlab-ci-utils/curl-jq:latest script: - !reference [ .get_version, script ] + - RELEASE_NAME=$VERSION - !reference [ .release_gitlab, script ] rules: - if: '$CI_COMMIT_REF_PROTECTED == "true"' @@ -64,7 +65,8 @@ release:latest:gitlab: - release image: registry.gitlab.com/gitlab-ci-utils/curl-jq:latest script: - - VERSION="Latest" + - !reference [ .get_version, script ] + - RELEASE_NAME="Latest" - !reference [ .release_gitlab, script ] rules: - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' @@ -76,7 +78,8 @@ release:pre-alpha:gitlab: - release image: registry.gitlab.com/gitlab-ci-utils/curl-jq:latest script: - - VERSION="Pre-alpha" + - !reference [ .get_version, script ] + - RELEASE_NAME="Pre-alpha" - !reference [ .release_gitlab, script ] rules: - if: '$CI_COMMIT_REF_PROTECTED == "true" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH' \ No newline at end of file