Skip to content

fix(dependabot): update rebase workflow to v2 — bypass fallback + schedule trigger - #154

Closed
don-petry wants to merge 11 commits into
mainfrom
fix/dependabot-rebase-v2
Closed

don-petry wants to merge 11 commits into
mainfrom
fix/dependabot-rebase-v2

Conversation

@don-petry

@don-petry don-petry commented May 7, 2026 •

Copy link
Copy Markdown
Contributor

Summary

  • SHA bump (b51e2ed → 02ce89b): The reusable workflow at 02ce89b fixes a bug where a failed update-branch call (due to missing workflows permission) caused the merge step to be skipped permanently; the fix falls through to a direct bypass merge instead.
  • Schedule trigger added: Adds a schedule: cron: '0 */4 * * *' trigger so the automerge chain doesn't stall when no pushes to main occur for days (e.g. quiet weekends).

Changes

  • .github/workflows/dependabot-rebase.yml: updated uses: SHA and added schedule trigger to the on: block.

Summary by CodeRabbit

  • Chores
    • Enhanced automated dependency management with improved reliability through additional scheduled checks.

Review Change Stack

Copilot AI review requested due to automatic review settings May 7, 2026 03:41
@don-petry
don-petry requested a review from a team as a code owner May 7, 2026 03:41
@coderabbitai

coderabbitai Bot commented May 7, 2026 •

Copy link
Copy Markdown

Warning

Rate limit exceeded

@don-petry has exceeded the limit for the number of commits that can be reviewed per hour. Please wait 29 minutes and 38 seconds before requesting another review.

You’ve run out of usage credits. Purchase more in the billing tab.

⌛ How to resolve this issue?

After the wait time has elapsed, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

We recommend that you space out your commits to avoid hitting the rate limit.

🚦 How do rate limits work?

CodeRabbit enforces hourly rate limits for each developer per organization.

Our paid plans have higher rate limits than the trial, open-source and free plans. In all cases, we re-allow further reviews after a brief timeout.

Please see our FAQ for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 4b6653c6-4c36-4c3f-80c8-9e3f521462f8

📥 Commits

Reviewing files that changed from the base of the PR and between 7a56cef and 277c26e.

📒 Files selected for processing (1)
  • .github/workflows/dependabot-rebase.yml
📝 Walkthrough

Walkthrough

The Dependabot rebase workflow now triggers on a scheduled cron basis every 4 hours as a safety net, in addition to the existing push trigger on main. Inline comments explain the scheduled trigger rationale. The file was also cleaned up by removing extraneous content.

Changes

Workflow trigger configuration

Layer / File(s) Summary
Scheduled Dependabot rebase trigger
.github/workflows/dependabot-rebase.yml
Workflow trigger definition extended with an on.schedule cron expression (0 */4 * * *) and explanatory comment; the existing on.push.branches: [main] trigger remains in place.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 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 two main changes: updating the rebase workflow to v2 (SHA bump with bug fix) and adding a schedule trigger as a fallback mechanism.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ 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 fix/dependabot-rebase-v2

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 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Updates the repo’s Dependabot rebase/merge “thin caller stub” workflow to a newer reusable-workflow commit and adds a scheduled trigger to keep the Dependabot queue moving even when main is quiet.

Changes:

  • Bump the referenced reusable workflow SHA for dependabot-rebase-reusable.yml.
  • Add an on.schedule cron trigger (every 4 hours) alongside the existing push + workflow_dispatch triggers.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment on lines 1 to 3
name: Dependabot update and merge

on:
Comment thread .github/workflows/dependabot-rebase.yml Outdated
Comment on lines +20 to +21
pull-requests: write # call update-branch API on behind PRs and merge when ready
uses: petry-projects/.github/.github/workflows/dependabot-rebase-reusable.yml@b51e2edf830ea085be0277bcf3174c7b3ec8f958 # v1
uses: petry-projects/.github/.github/workflows/dependabot-rebase-reusable.yml@02ce89bb84ba8fe7650f97522893cfdab25e060a # v1
donpetry-bot
donpetry-bot previously approved these changes May 10, 2026

@donpetry-bot donpetry-bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Automated review — APPROVED ✓

Risk: LOW
Reviewed commit: 1272435b13fdb4acb2de927d76806ee7e2280ff9
Review mode: triage-approved (single reviewer)

Summary

Prompt-only changes to the org status report template that reduce output size by ~29K bytes. Three changes: (1) Open Issues grouped by repo subsection instead of flat table, dropping the repeated Repo column; (2) duplicate [#N](url) | [title](url) cells merged into single [#N — title](url) cells across Needs Human Review, Open Issues, and Open Discussions tables; (3) MAX_BYTES bumped from 60000 to 64000 (still 1536 bytes below GitHub's 65536 char limit). No data-shape changes.

Linked issue analysis

No closing issue linked, but the PR body clearly describes the problem: daily report #233 exceeded the 60000-byte truncation threshold, causing head -c to drop the start of the report (the @org-leads opener and first three sections). The changes directly address this by shrinking the rendered output.

Findings

No issues found.

  • MAX_BYTES 64000: Safe — leaves 1536 bytes of headroom below GitHub's 65536-char issue body limit. Combined with the ~29K reduction in report size, truncation should rarely trigger.
  • Prompt template changes: Clean restructuring. The per-repo subsection format for Open Issues and the single-link cell pattern are consistent across all three tables.
  • No security concerns: No secrets, auth, eval, injection vectors, or CI security changes.
  • Copilot's suppressed comment about UTF-8 truncation in head -c is a pre-existing concern in the truncation step, not introduced by this PR.

CI status

All checks passed:

  • Lint: ✓
  • ShellCheck: ✓
  • Agent Security Scan: ✓
  • AgentShield: ✓
  • CodeQL (actions): ✓
  • SonarCloud: ✓ (0 new issues, 0 security hotspots)
  • Dependency audit: ✓

Reviewed automatically by the PR-review agent (single-reviewer). Reply if you need a human review.

@donpetry-bot
donpetry-bot enabled auto-merge (squash) May 10, 2026 23:13
@github-actions

Copy link
Copy Markdown
Contributor

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved manually.

Please resolve the conflicts and push:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry don-petry closed this May 11, 2026
auto-merge was automatically disabled May 11, 2026 21:39

Pull request was closed

@don-petry don-petry reopened this May 11, 2026
@don-petry
don-petry enabled auto-merge (squash) May 12, 2026 01:40
@don-petry
don-petry force-pushed the fix/dependabot-rebase-v2 branch from f22a9ef to 47c9309 Compare May 13, 2026 17:07
@github-actions

Copy link
Copy Markdown
Contributor

Auto-rebase blocked — the base branch contains .github/workflows/ changes that require the workflows permission to merge into this branch, but the auto-rebase workflow's token does not have that permission.

Please rebase this branch manually:

git fetch origin
git rebase origin/main
git push --force-with-lease

@sonarqubecloud

Copy link
Copy Markdown

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

@dev-lead - please fix this PR

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@don-petry

Copy link
Copy Markdown
Contributor Author

Auto-rebase failed — merge conflict — this branch has conflicts with main that must be resolved.

dev-lead will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention.

To resolve manually instead:

git fetch origin
git merge origin/main
# resolve conflicts, then:
git add .
git commit
git push

@donpetry-bot

donpetry-bot commented Jun 2, 2026 •

Copy link
Copy Markdown
Contributor
Superseded by automated re-review at 277c26e72aa5679952f7d01627f27878c5414d0f — click to expand prior review.

Review — fix requested (cycle 2/3)

The automated review identified the following issues. Please address each one:

Findings to fix

Automated review — NEEDS HUMAN REVIEW

Risk: MEDIUM
Reviewed commit: 277c26e72aa5679952f7d01627f27878c5414d0f
Cascade: triage → deep (triage: haiku 4.5 → deep: sonnet 4.6 + duck: o4-mini → audit: opus 4.7)

Summary

PR cannot merge — stuck in a conflict state since 2026-05-11 (21+ days, 15+ failed rebase attempts) because the auto-rebase token lacks the workflows permission required to rebase over .github/workflows/ changes on main. Additionally, the existing automated approval on this PR was clearly issued for a different PR (it describes org-status-report template changes, not this workflow fix), so that approval is invalid. The functional changes themselves (schedule trigger + SHA bump) are low-risk, but the hard merge-gate failure and invalid prior approval block approval here.

Findings

  • MAJOR: PR has been CONFLICTING since 2026-05-11 (21+ days, 15+ failed auto-rebase attempts). Root cause identified in 2026-05-19 bot comment: the base branch contains .github/workflows/ changes that require the workflows permission, which the auto-rebase token does not have. Manual git fetch origin && git rebase origin/main && git push --force-with-lease is required. This is a hard gate failure.
  • MAJOR: The automated approval posted by donpetry-bot (SHA=1272435b) on this PR describes entirely unrelated changes ('Open Issues grouped by repo subsection', 'MAX_BYTES bumped from 60000 to 64000', 'org status report template'). This was a review-bot misfiring on the wrong PR. The approval it granted is not valid for this PR's actual content and should be disregarded.
  • MINOR: Removes 25 lines of maintainer documentation from the top of the workflow file: source-of-truth pointers (standards repo paths), agent editing constraints (concurrency group, secrets, permissions must not be changed), and adoption instructions. This institutional knowledge is lost from the file; future maintainers and automated agents lose in-file guidance on what is and is not safe to edit in this stub.
  • MINOR: PR body claims a SHA bump from b51e2ed to 02ce89b for the reusable workflow in petry-projects/.github, but this change is not visible in the diff (the uses: line is either in the conflicted section or has already landed on main). The referenced fix (bypass fallback for failed update-branch calls) cannot be verified from this context.
  • INFO: All checks from last run (2026-05-19) passed: SonarCloud (0 new issues, 0 security hotspots), CodeQL (success), AgentShield (success), CodeRabbit (rate-limited but pre-merge checks all passed). CI is green on the last resolvable commit; stale due to conflict.
  • INFO: Schedule trigger cron: '0 */4 * * *' (every 4 hours) added as a safety net when no pushes to main occur. This is a reasonable operational addition — the existing push and workflow_dispatch triggers remain. No security concerns with the trigger itself.

Reviewed by the PR-review cascade (triage: haiku 4.5 → deep: sonnet 4.6 + duck: o4-mini → audit: opus 4.7). Reply if you need a human review.

Additional tasks

  1. Resolve all unresolved review thread comments from other reviewers
  2. Ensure all CI checks pass after your changes
  3. Rebase on the target branch if behind
  4. Do NOT modify files unrelated to the findings above

The review cascade will automatically re-review after new commits are pushed.

@donpetry-bot
donpetry-bot dismissed their stale review June 2, 2026 19:34

Superseded by automated re-review at 277c26e.

@donpetry-bot

Copy link
Copy Markdown
Contributor

Review — fix requested (cycle 3/3)

The automated review identified the following issues. Please address each one:

Findings to fix

Automated review — NEEDS HUMAN REVIEW

Risk: MEDIUM
Reviewed commit: 277c26e72aa5679952f7d01627f27878c5414d0f
Cascade: triage → deep (triage: haiku 4.5 → deep: sonnet 4.6 + duck: o4-mini → audit: opus 4.7)

Summary

PR #154 is stuck: same HEAD SHA (277c26e) as the prior review cycle — the author has not pushed any changes. The branch has been conflicting with main since 2026-05-11 (23+ days, 15+ failed auto-rebase attempts) due to a permissions gap in the auto-rebase token for .github/workflows/ changes; manual rebase is required. Until the conflict is resolved and CI reruns, this PR cannot be approved.

Findings

  • MAJOR: PR has been CONFLICTING since 2026-05-11 (23+ days as of 2026-06-03). The auto-rebase bot cannot resolve it because the base branch contains .github/workflows/ changes that require the 'workflows' permission the bot token lacks. Manual resolution required: git fetch origin && git rebase origin/main && git push --force-with-lease.
  • MAJOR: PR HEAD SHA (277c26e) is identical to the prior review cycle SHA. The author has not pushed any changes since the last review was posted on 2026-06-02. All previously identified findings remain unaddressed.
  • MAJOR: Last CI run was 2026-05-19 (15 days ago on commit db83a76). CI must rerun on a clean, rebased branch before approval — the conflict state means no fresh CI results exist for the current code against main.
  • MINOR: PR description claims a SHA bump from b51e2ed to 02ce89b in the 'uses:' line referencing petry-projects/.github reusable workflow, but this change is not visible in the diff — it is either in the conflicted section or already landed on main. The described fix (bypass fallback when update-branch call fails due to missing 'workflows' permission) cannot be verified from the current diff context.
  • MINOR: 25 lines of maintainer documentation removed: source-of-truth pointers (standards repo paths), agent editing constraints (must not change concurrency group name, secrets block, or permissions block), and adoption instructions. This institutional knowledge guided both automated agents and human maintainers on what is and is not safe to modify in this stub caller.
  • INFO: Added cron: '0 */4 * * *' schedule trigger as a safety net for quiet periods when no pushes to main occur. Operationally sound addition — existing push and workflow_dispatch triggers remain. No security concerns with the trigger itself.
  • INFO: Last CI run (2026-05-19, commit db83a76) passed all checks: SonarCloud (0 new issues, 0 security hotspots), CodeQL (success), AgentShield (success), CodeRabbit pre-merge checks (all 5 passed). Results are stale due to conflict but were green at last run.
  • INFO: The only formal review on this PR (donpetry-bot, state=DISMISSED) described entirely unrelated changes (org-status-report template, MAX_BYTES bump). That approval was for SHA 1272435b and has been dismissed. reviewDecision is currently empty — no valid approval exists for this PR.

Reviewed by the PR-review cascade (triage: haiku 4.5 → deep: sonnet 4.6 + duck: o4-mini → audit: opus 4.7). Reply if you need a human review.

Additional tasks

  1. Resolve all unresolved review thread comments from other reviewers
  2. Ensure all CI checks pass after your changes
  3. Rebase on the target branch if behind
  4. Do NOT modify files unrelated to the findings above

The review cascade will automatically re-review after new commits are pushed.

@don-petry

Copy link
Copy Markdown
Contributor Author

Closing due to merge conflict — re-implementing from fresh main

@don-petry don-petry closed this Jun 3, 2026
auto-merge was automatically disabled June 3, 2026 01:55

Pull request was closed

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.

3 participants