diff --git a/.github/workflows/changelog.yaml b/.github/workflows/changelog.yaml index c72f8121..d63461b2 100644 --- a/.github/workflows/changelog.yaml +++ b/.github/workflows/changelog.yaml @@ -50,6 +50,7 @@ jobs: if [[ ! ${GITHUB_REF##*/} =~ $prerelease_regex ]]; then echo '::debug::Actual release (not a prerelease)' TAG_REGEX="$prerelease_regex" + echo "FULL_RELEASE=true" >> $GITHUB_ENV fi fi echo "::debug::TAG_REGEX: $TAG_REGEX" @@ -133,3 +134,10 @@ jobs: git commit -m "Update changelog [ci skip]" git push origin $BRANCH + - name: Merge to Release branch + if: env.FULL_RELEASE + run: | + git checkout release + git merge --ff-only $BRANCH + git push origin release +