Merge branch 'fix-latest-and-pre_alpha' into v3.3.0

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,

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