Skip to content

Commit 906079b

Browse files
authored
Simplify PR merge step in publish workflow (#59)
1 parent 6afc03b commit 906079b

1 file changed

Lines changed: 5 additions & 18 deletions

File tree

.github/workflows/publish.yaml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -102,24 +102,11 @@ jobs:
102102
103103
echo "Created PR: $PR_URL"
104104
105-
gh pr merge "$BRANCH_NAME" --auto --squash || gh pr merge "$BRANCH_NAME" --auto --merge
106-
107-
echo "Waiting for PR to be merged..."
108-
for i in {1..60}; do
109-
if gh pr view "$BRANCH_NAME" --json state --jq '.state' | grep -q "MERGED"; then
110-
echo "PR merged successfully"
111-
112-
MERGE_SHA=$(gh pr view "$BRANCH_NAME" --json mergeCommit --jq '.mergeCommit.oid')
113-
echo "merge_sha=$MERGE_SHA" >> "$GITHUB_OUTPUT"
114-
echo "Merge commit: $MERGE_SHA"
115-
break
116-
fi
117-
if [ $i -eq 60 ]; then
118-
echo "ERROR: PR was not merged within 5 minutes" >&2
119-
exit 1
120-
fi
121-
sleep 5
122-
done
105+
gh pr merge "$BRANCH_NAME" --squash || gh pr merge "$BRANCH_NAME" --merge
106+
107+
MERGE_SHA=$(gh pr view "$BRANCH_NAME" --json mergeCommit --jq '.mergeCommit.oid')
108+
echo "merge_sha=$MERGE_SHA" >> "$GITHUB_OUTPUT"
109+
echo "Merge commit: $MERGE_SHA"
123110
124111
- name: Create tag and publish release
125112
env:

0 commit comments

Comments
 (0)