diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01cdb69ddad619ced4e68b86be70c4a37d0f6683..a5322dd13132c688dbdecb1f9aee199d359de840 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,9 +36,8 @@ variables: .get_version: script: - - IS_DEV=$([[ $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH ]] && echo 'false' || echo 'true') - - > - VERSION=$(jq -r .version $PROJECT_FOLDER/package.json)$([[ IS_DEV == 'true' ]] && echo $VERSION_DEV_SUFFIX || echo '') + - IS_DEV=$([[ $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH ]] && echo false || echo true) + - VERSION=$(jq -r .version $PROJECT_FOLDER/package.json)$([[ $IS_DEV == true ]] && echo $VERSION_DEV_SUFFIX || echo '') .get_packages_url: script: @@ -248,7 +247,7 @@ release_job: - CHANGELOG_LINE_END=`awk '/##\ [0-9]+\.[0-9]+\.[0-9]+/{ count++; if(count>1) {print NR; exit;}}' CHANGELOG.md` - DESCRIPTION=`awk 'NR > '$CHANGELOG_LINE_START' && NR < '$CHANGELOG_LINE_END'' CHANGELOG.md` - > - RELEASE_DATA=$(jq --null-input --arg version "$VERSION" --arg description "\n# Changelog (version $VERSION)\n$DESCRIPTION" --arg tag_name "$VERSION" --arg ref "$CI_COMMIT_SHORT_SHA" '{ + RELEASE_DATA=$(jq --null-input --arg version "$VERSION" --arg description "# Changelog (version $VERSION) $DESCRIPTION" --arg tag_name "$VERSION" --arg ref "$CI_COMMIT_SHORT_SHA" '{ "name": $version, "description": $description, "tag_name": $tag_name,