Skip to content

Commit 2cc908d

Browse files
committed
Update merge PR
1 parent ebe4a77 commit 2cc908d

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

.github/workflows/_conda-forge-package-release.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
[ -n "$RUN_ID" ] && gh run rerun "$RUN_ID" --repo "$REPO" --failed \
8181
|| echo "No failed runs."
8282
83-
- name: Wait for ${{ inputs.package }} feedstock PR to merge
83+
- name: Merge and wait for ${{ inputs.package }} feedstock PR
8484
run: |
8585
REPO="${{ inputs.feedstock }}"
8686
SEARCH="${{ inputs.pr_search }}"
@@ -89,6 +89,11 @@ jobs:
8989
--search "$SEARCH" --json state -q '.[0].state // "NOT_FOUND"')
9090
echo "Attempt $i: ${STATE}"
9191
[ "$STATE" = "MERGED" ] && exit 0
92+
PR=$(gh pr list --repo "$REPO" --state open \
93+
--search "$SEARCH" --json number -q '.[0].number')
94+
if [ -n "$PR" ]; then
95+
gh pr merge "$PR" --repo "$REPO" --merge --auto 2>/dev/null || true
96+
fi
9297
sleep ${{ inputs.poll_interval }}
9398
done
9499
echo "Timed out waiting for ${{ inputs.package }} PR to merge." && exit 1

0 commit comments

Comments
 (0)