Skip to content

Add CodeRabbit pre-merge checks for upstream change validation#678

Merged
RomanNikitenko merged 2 commits intoche-incubator:mainfrom
sbouchet:coderabbit-pre-merge-checks
Apr 6, 2026
Merged

Add CodeRabbit pre-merge checks for upstream change validation#678
RomanNikitenko merged 2 commits intoche-incubator:mainfrom
sbouchet:coderabbit-pre-merge-checks

Conversation

@sbouchet
Copy link
Copy Markdown
Collaborator

@sbouchet sbouchet commented Apr 2, 2026

What does this PR do?

follow-up of #672

Added pre-merge check for rebase rules

What issues does this PR fix?

related to eclipse-che/che#23749

How to test this PR?

Does this PR contain changes that override default upstream Code-OSS behavior?

  • the PR contains changes in the code folder (you can skip it if your changes are placed in a che extension )
  • the corresponding items were added to the CHANGELOG.md file
  • rules for automatic git rebase were added to the .rebase folder

Summary by CodeRabbit

  • Chores
    • Strengthened pre-merge checks to require accompanying rebase artifacts, a changelog entry, and conflict-routing updates when core code changes are present.
    • Minor cleanup: removed an extraneous trailing space in configuration text.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 2, 2026

Click here to review and test in web IDE: Contribute

@sbouchet sbouchet marked this pull request as ready for review April 2, 2026 14:48
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 2, 2026

Warning

Ignoring CodeRabbit configuration file changes. For security, only the configuration from the base branch is applied for open source repositories.

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: dcf46f92-e01e-444d-9058-b1368ced46aa

📥 Commits

Reviewing files that changed from the base of the PR and between ad17482 and cb3cb09.

📒 Files selected for processing (1)
  • .coderabbit.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • .coderabbit.yaml

📝 Walkthrough

Walkthrough

Updated .coderabbit.yaml: removed trailing space in tone_instructions and added a new reviews.pre_merge_checks configuration. Introduced a custom_checks rule named “Rebase rules for upstream changes” (mode: error) that fails PRs which modify files under code/ (excluding code/extensions/che-*/** and lock files) unless the PR also updates matching .rebase/ rule files, includes a .rebase/CHANGELOG.md entry, and updates rebase.sh conflict-routing for the new rules. The check defines explicit PASS/FAIL conditions based on presence of code/ changes and corresponding rebase artifacts.

Sequence Diagram(s)

(Section intentionally omitted.)

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

Suggested reviewers

  • azatsarynnyy
  • vitaliy-guliy
  • rgrunber
🚥 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 accurately describes the main change: adding CodeRabbit pre-merge checks for upstream change validation, which matches the addition of the reviews.pre_merge_checks configuration with the 'Rebase rules for upstream changes' custom check.
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

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.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 2, 2026

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@github-actions
Copy link
Copy Markdown

github-actions bot commented Apr 3, 2026

@RomanNikitenko RomanNikitenko merged commit 66e552f into che-incubator:main Apr 6, 2026
14 checks passed
@coderabbitai coderabbitai bot mentioned this pull request Apr 6, 2026
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants