Skip to content

Tell Renovate to rebase when merging failed#319

Merged
5ouma merged 2 commits intomainfrom
ci-ci-checker-rebase-pr
Oct 16, 2025
Merged

Tell Renovate to rebase when merging failed#319
5ouma merged 2 commits intomainfrom
ci-ci-checker-rebase-pr

Conversation

@5ouma
Copy link
Owner

@5ouma 5ouma commented Oct 16, 2025

⚠️ Issue

close #


✏️ Description

It might have conflicts, and Renovate will not rebase automatically.

@5ouma
ci(ci-checker): Tell Renovate to rebase when merging failed
28af833 
It might have conflicts, and Renovate will not rebase automatically.
Copilot AI review requested due to automatic review settings October 16, 2025 14:11
@github-actions github-actions bot added the 🎽 CI Changes to CI configuration files and scripts label Oct 16, 2025
@coderabbitai
Copy link

coderabbitai bot commented Oct 16, 2025 •
edited
Loading

Caution

Review failed

Failed to post review comments

Note

Other AI code review bot(s) detected

CodeRabbit has detected other AI code review bot(s) in this pull request and will avoid duplicating their findings in the review comments. This may lead to a less comprehensive review.

Walkthrough

Adds a new CI job "🔄 Rebase PR" to .github/workflows/ci-checker.yml that runs when merge-pr fails, checks out the repo (no persisted credentials), and edits the PR body to mark a rebase-needed checkbox using the GitHub CLI and GITHUB_HEAD_REF.

Changes

Cohort / File(s) Summary
CI workflow: rebase job
.github/workflows/ci-checker.yml		 Added rebase-pr job (name: "🔄 Rebase PR") which runs on ubuntu-latest with timeout-minutes: 1, needs: merge-pr, if: failure(), permissions: pull-requests: write; checks out repo with persist-credentials: false and runs a gh pr edit/gh pr view + sed pipeline to toggle the rebase checkbox in the PR body, using GITHUB_TOKEN.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Pre-merge checks and finishing touches

✅ Passed checks (3 passed)
Check name Status Explanation
Title Check ✅ Passed The title clearly conveys the main change of instructing Renovate to perform a rebase after a merge failure, which directly aligns with the added CI workflow job, and it is concise and focused without extraneous details.
Description Check ✅ Passed The description references the conflict scenario and Renovate’s lack of automatic rebasing, which corresponds to the CI workflow update in the changeset, so it is relevant to the pull request.
Docstring Coverage ✅ Passed No functions found in the changes. Docstring coverage check skipped.
✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch ci-ci-checker-rebase-pr

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.

Copilot AI reviewed Oct 16, 2025
View reviewed changes
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR adds a workflow job to automatically trigger Renovate rebases when PR merges fail due to conflicts. When the merge job fails, a new rebase job checks the "rebase-check" box in the PR body to signal Renovate to rebase the PR.

  • Adds a new rebase-pr job that runs after merge-pr fails
  • Uses GitHub CLI to modify the PR body and check the rebase checkbox

Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.

@5ouma 5ouma merged commit 5aa3e48 into main Oct 16, 2025
10 of 11 checks passed
@5ouma 5ouma deleted the ci-ci-checker-rebase-pr branch October 16, 2025 14:29
@5ouma 5ouma bot mentioned this pull request Oct 16, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@coderabbitai coderabbitai[bot] coderabbitai[bot] approved these changes

Assignees

@5ouma 5ouma

Labels

🎽 CI Changes to CI configuration files and scripts

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@5ouma