Skip to content

fix(release): merge release commits through PRs #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rozsazoltan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(release): merge release commits through PRs #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ on:

permissions:
contents: write
pull-requests: write

concurrency:
group: release-${{ inputs.version }}
Expand Down Expand Up @@ -118,11 +119,17 @@ jobs:
git add metadata.lua
git -c commit.gpgSign=false commit -m "chore(release): ${tag}"

git switch "${DEFAULT_BRANCH}"
git merge --squash "${branch}"
git -c commit.gpgSign=false commit -m "chore(release): ${tag}"
git push origin "HEAD:refs/heads/${DEFAULT_BRANCH}"
git branch -D "${branch}"
git push --set-upstream origin "${branch}"

export GH_TOKEN="${RELEASE_TOKEN}"
pr_url="$(gh pr create --base "${DEFAULT_BRANCH}" --head "${branch}" --title "chore(release): ${tag}" --body "Automated release preparation for ${tag}.")"
pr_number="$(gh pr view "${pr_url}" --json number --jq .number)"

gh api --method PUT "repos/${GITHUB_REPOSITORY}/pulls/${pr_number}/merge" -f commit_title="chore(release): ${tag}" -f merge_method=squash

git fetch origin "${DEFAULT_BRANCH}" --force
git switch -C "${DEFAULT_BRANCH}" "origin/${DEFAULT_BRANCH}"
git push origin --delete "${branch}"

sha="$(git rev-parse HEAD)"
echo "sha=${sha}" >> "${GITHUB_OUTPUT}"
Expand Down