Skip to content

ci: remove ready-for-review label when merge-conflict is added #571

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

Merged
xdustinface merged 1 commit into from
Mar 21, 2026
+11 −1
Merged

ci: remove ready-for-review label when merge-conflict is added #571

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
12 changes: 11 additions & 1 deletion .github/workflows/ready-for-review.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Ready for Review Label

on:
pull_request:
types: [ready_for_review]
types: [ready_for_review, labeled]
pull_request_review:
types: [submitted, dismissed]
workflow_run:
Expand Down Expand Up @@ -90,6 +90,7 @@ jobs:
EVENT_ACTION: ${{ github.event.action }}
REVIEW_STATE: ${{ github.event.review.state }}
PR_NUMBER_DIRECT: ${{ github.event.pull_request.number }}
LABEL_NAME: ${{ github.event.label.name }}
PULL_REQUESTS_JSON: ${{ toJson(github.event.workflow_run.pull_requests) }}
run: |
# On review dismissal or changes requested, remove label and exit
Expand All @@ -101,6 +102,15 @@ jobs:
fi
fi

# On merge-conflict label, remove ready-for-review and exit
if [ "$EVENT_NAME" = "pull_request" ] && [ "$EVENT_ACTION" = "labeled" ]; then
if [ "$LABEL_NAME" = "merge-conflict" ]; then
echo "Merge conflict detected, removing ready-for-review label."
gh pr edit "$PR_NUMBER_DIRECT" --repo "$REPO" --remove-label "ready-for-review" || true
fi
exit 0
fi

# Collect PR numbers depending on the event type
if [ "$EVENT_NAME" = "workflow_run" ]; then
PR_NUMBERS=$(echo "$PULL_REQUESTS_JSON" | jq -r '.[].number')
Expand Down
Loading