mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-20 13:08:31 +02:00
add step in workflow to merge to release branch after a release
This commit is contained in:
parent
bff69ad3f3
commit
3db727b038
1 changed files with 8 additions and 0 deletions
8
.github/workflows/changelog.yaml
vendored
8
.github/workflows/changelog.yaml
vendored
|
@ -50,6 +50,7 @@ jobs:
|
||||||
if [[ ! ${GITHUB_REF##*/} =~ $prerelease_regex ]]; then
|
if [[ ! ${GITHUB_REF##*/} =~ $prerelease_regex ]]; then
|
||||||
echo '::debug::Actual release (not a prerelease)'
|
echo '::debug::Actual release (not a prerelease)'
|
||||||
TAG_REGEX="$prerelease_regex"
|
TAG_REGEX="$prerelease_regex"
|
||||||
|
echo "FULL_RELEASE=true" >> $GITHUB_ENV
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
echo "::debug::TAG_REGEX: $TAG_REGEX"
|
echo "::debug::TAG_REGEX: $TAG_REGEX"
|
||||||
|
@ -133,3 +134,10 @@ jobs:
|
||||||
git commit -m "Update changelog [ci skip]"
|
git commit -m "Update changelog [ci skip]"
|
||||||
git push origin $BRANCH
|
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
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue