Skip to content

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

Merged
xdustinface merged 1 commit intov0.42-devfrom
ci/ready-for-review-merge-conflict
Mar 21, 2026
Merged

ci: remove ready-for-review label when merge-conflict is added#571
xdustinface merged 1 commit intov0.42-devfrom
ci/ready-for-review-merge-conflict

Conversation

@xdustinface
Copy link
Collaborator

@xdustinface xdustinface commented Mar 21, 2026

Listen for pull_request labeled events and remove the ready-for-review label when merge-conflict is applied.

Summary by CodeRabbit

  • Chores
    • Updated CI workflow to recognize merge-conflict labels on pull requests, automatically removing the ready-for-review label and skipping standard evaluation when conflicts are detected.

Listen for `pull_request` `labeled` events and remove the
`ready-for-review` label when `merge-conflict` is applied.
@xdustinface xdustinface marked this pull request as draft March 21, 2026 18:49
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Mar 21, 2026

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: c7a1e438-8bb9-476f-bccc-6f083f5ec482

📥 Commits

Reviewing files that changed from the base of the PR and between fe82b98 and 8137c0c.

📒 Files selected for processing (1)
  • .github/workflows/ready-for-review.yml

📝 Walkthrough

Walkthrough

The workflow now triggers on both ready_for_review and labeled pull request events. When a merge-conflict label is applied, the workflow removes the ready-for-review label and skips the usual review evaluation. The LABEL_NAME environment variable is exported to capture the applied label.

Changes

Cohort / File(s) Summary
Workflow Trigger & Conditional Logic
.github/workflows/ready-for-review.yml
Expanded trigger types to include labeled event; added LABEL_NAME environment variable export; introduced conditional branch to detect merge-conflict label and remove ready-for-review label before exiting early.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Poem

A rabbit hops through CI's lane,
Detecting conflicts with care,
When labels dance, it clears the slate,
Ready-for-review fades away,
Smooth workflows bloom everywhere! 🐰✨

🚥 Pre-merge checks | ✅ 3
✅ Passed checks (3 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and accurately summarizes the main change: removing the ready-for-review label when merge-conflict is added, which matches the workflow modification.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch ci/ready-for-review-merge-conflict

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Tip

You can validate your CodeRabbit configuration file in your editor.

If your editor has YAML language server, you can enable auto-completion and validation by adding # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json at the top of your CodeRabbit configuration file.

@codecov
Copy link

codecov bot commented Mar 21, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 66.33%. Comparing base (fe82b98) to head (8137c0c).
⚠️ Report is 1 commits behind head on v0.42-dev.

Additional details and impacted files
@@              Coverage Diff              @@
##           v0.42-dev     #571      +/-   ##
=============================================
- Coverage      66.33%   66.33%   -0.01%     
=============================================
  Files            311      311              
  Lines          64976    64976              
=============================================
- Hits           43104    43099       -5     
- Misses         21872    21877       +5     
Flag Coverage Δ
core 75.13% <ø> (ø)
ffi 36.78% <ø> (-0.02%) ⬇️
rpc 28.28% <ø> (ø)
spv 81.10% <ø> (-0.03%) ⬇️
wallet 66.27% <ø> (ø)
see 3 files with indirect coverage changes

@xdustinface xdustinface marked this pull request as ready for review March 21, 2026 18:54
@github-actions github-actions bot added the ready-for-review CodeRabbit has approved this PR label Mar 21, 2026
@xdustinface xdustinface merged commit 19fb152 into v0.42-dev Mar 21, 2026
38 checks passed
@xdustinface xdustinface deleted the ci/ready-for-review-merge-conflict branch March 21, 2026 18:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-for-review CodeRabbit has approved this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant