diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1ee529e..9a28401 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -183,7 +183,9 @@ jobs: DATE_UTC=$(date -u '+%Y-%m-%d %H:%M UTC') CHANGELOG_FILE="" - if [ -f "docs/ru/CHANGELOG.md" ]; then + if [ -f "wiki/Changelog.md" ]; then + CHANGELOG_FILE="wiki/Changelog.md" + elif [ -f "docs/ru/CHANGELOG.md" ]; then CHANGELOG_FILE="docs/ru/CHANGELOG.md" elif [ -f "docs/en/CHANGELOG_EN.md" ]; then CHANGELOG_FILE="docs/en/CHANGELOG_EN.md" @@ -191,9 +193,10 @@ jobs: CHANGELOG_SECTION="" if [ -n "${CHANGELOG_FILE}" ]; then + # Поддерживаем оба формата заголовков: "## [VERSION]" и "### [VERSION] - DATE" CHANGELOG_SECTION=$(awk -v ver="${VERSION}" ' - $0 ~ "^## \\[" ver "\\]" { in_section=1; next } - /^## \[/ && in_section { exit } + $0 ~ "^#{2,3} \\[" ver "\\]" { in_section=1; next } + /^#{2,3} \[/ && in_section { exit } in_section { print } ' "${CHANGELOG_FILE}") fi @@ -210,7 +213,7 @@ jobs: fi { - echo "## ${TAG}" + echo "## Release ${TAG}" echo "" echo "Релиз скриптового проекта без компиляции бинарников." echo "" @@ -310,9 +313,9 @@ jobs: ) if [ "${HOST}" = "github.com" ]; then - RELEASE_PAYLOAD="{\"tag_name\":\"${TAG}\",\"target_commitish\":\"${TARGET_COMMITISH}\",\"name\":\"${TAG}\",\"body\":${BODY_JSON},\"draft\":false,\"prerelease\":false}" + RELEASE_PAYLOAD="{\"tag_name\":\"${TAG}\",\"target_commitish\":\"${TARGET_COMMITISH}\",\"name\":\"Release ${TAG}\",\"body\":${BODY_JSON},\"draft\":false,\"prerelease\":false}" else - RELEASE_PAYLOAD="{\"tag_name\":\"${TAG}\",\"target\":\"${TARGET_COMMITISH}\",\"title\":\"${TAG}\",\"note\":${BODY_JSON},\"draft\":false,\"prerelease\":false}" + RELEASE_PAYLOAD="{\"tag_name\":\"${TAG}\",\"target\":\"${TARGET_COMMITISH}\",\"title\":\"Release ${TAG}\",\"note\":${BODY_JSON},\"draft\":false,\"prerelease\":false}" fi echo ">>> Создание релиза для тега ${TAG}..."