File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff 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 :
You can’t perform that action at this time.
0 commit comments