fix(ci): downgrade pnpm/action-setup to v5 in dependency-audit reusable#152
fix(ci): downgrade pnpm/action-setup to v5 in dependency-audit reusable#152don-petry wants to merge 13 commits into
Conversation
|
Warning Rate limit exceeded
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 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 configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: 📒 Files selected for processing (1)
📝 WalkthroughWalkthroughUpdated the Changes
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~2 minutes 🚥 Pre-merge checks | ✅ 3✅ Passed checks (3 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
There was a problem hiding this comment.
Pull request overview
This PR fixes a breaking CI regression in the org’s reusable dependency-audit workflow by pinning pnpm/action-setup to a compatible major version, avoiding pnpm v11-rc bootstrapping that fails on pnpm v9 lockfiles.
Changes:
- Downgrade
pnpm/action-setuppin in the pnpm audit job from the (mis-labeled) v6 SHA to a v5.0.0 SHA.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Outdated review (superseded by re-review at
|
Outdated review (superseded by re-review at
|
Outdated review (superseded by re-review at
|
donpetry-bot
left a comment
There was a problem hiding this comment.
Reviewed by the don-petry PR-review cascade (triage: haiku 4.5 → deep: sonnet 4.6 + duck: gpt-5.4 → audit: opus 4.6). Reply with @don-petry if you need a human.
|
Auto-rebase failed — merge conflict — this branch has conflicts with Please resolve the conflicts and push: |
Automated review — human attention neededThis PR has been through 3 automated review cycles (cap: 3) without converging on an approval-and-merge state. Further automated review has been paused to avoid infinite loops. Please take a look manually, or close this PR if it's no longer needed. Once a human review resolves the situation, remove the Posted by the donpetry-bot PR-review cascade. |
|
Auto-rebase failed — merge conflict — this branch has conflicts with Claude will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with Claude will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Agentic rebase — conflict analysis complete, manual resolution required I analyzed the merge conflict on this PR but was unable to complete the rebase because Conflict identifiedFile:
Resolution: Per the SHA-pin conflict policy, accept the side with the more recent commit date — main's Manual resolution stepsgit fetch origin
git rebase origin/main
# Conflict in: .github/workflows/dependency-audit-reusable.yml
# Resolution: keep main's version (newer SHA — v4, committed 2026-05-07)
git checkout --ours -- .github/workflows/dependency-audit-reusable.yml
git add .github/workflows/dependency-audit-reusable.yml
git rebase --continue
git push --force-with-lease |
Auto-Rebase — Conflict AnalysisThe auto-rebase workflow detected a conflict and I performed a full analysis. However, the rebase could not be completed automatically due to permission restrictions in this environment. Here is everything needed to complete the resolution manually. Conflict detailsFile:
Resolution: Keep the PR branch version ( Reason: Both sides modified the same Manual resolution stepsgit fetch origin
git checkout fix/dependency-audit-pnpm-action-setup-v5
git rebase origin/mainWhen the conflict appears in # Keep the PR branch's pnpm/action-setup pin (v5.0.0):
git checkout --theirs -- .github/workflows/dependency-audit-reusable.yml
git add .github/workflows/dependency-audit-reusable.yml
git rebase --continueThen push: git push --force-with-leaseThe only conflict is the single |
|
Auto-rebase failed — merge conflict — this branch has conflicts with Claude will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
Auto-Rebase: Manual Resolution RequiredThe auto-rebase agent analyzed PR #152 but could not complete the rebase automatically — the git write operations ( Conflict AnalysisFile:
Resolution strategy (per SHA-pin rules): The base branch SHA has a newer commit date → prefer
Manual Resolution Stepsgit fetch origin
git checkout fix/dependency-audit-pnpm-action-setup-v5
git rebase origin/main
# Git will stop with a conflict in:
# .github/workflows/dependency-audit-reusable.yml
# Option A — accept main's newer SHA (mechanical rule):
git checkout --ours -- .github/workflows/dependency-audit-reusable.yml
# Option B — keep PR's v5.0.0 pin (if pnpm v9 compatibility still matters):
git checkout --theirs -- .github/workflows/dependency-audit-reusable.yml
git add .github/workflows/dependency-audit-reusable.yml
git rebase --continue
git push --force-with-lease |
|
Auto-rebase failed — merge conflict — this branch has conflicts with Claude will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with Claude will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
The SHA 08c4be7e (mislabeled # v4) is actually pnpm/action-setup@v6.0.0, which bootstraps with pnpm v11.0.0-rc.0. pnpm v11-rc cannot parse lockfiles generated by pnpm v9 (lockfileVersion '9.0'), causing ERR_PNPM_BROKEN_LOCKFILE in all repos still on pnpm v9. Pinning to action-setup@v5.0.0 (fc06bc1), which installs pnpm via npm directly with no v11 bootstrap, restoring compatibility with pnpm v9.
99b833b
588b01d to
99b833b
Compare
|
Auto-rebase failed — merge conflict — this branch has conflicts with Claude will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with Claude will attempt to resolve this automatically. If it cannot, a follow-up comment will explain what needs manual attention. To resolve manually instead: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
@dev-lead - please fix this PR |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
|
Auto-rebase failed — merge conflict — this branch has conflicts with 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: |
Problem
The SHA `08c4be7e` pinned in `dependency-audit-reusable.yml` is labeled `# v4` but is actually pnpm/action-setup@v6.0.0. v6 bootstraps with pnpm v11.0.0-rc.0, which cannot parse `lockfileVersion: '9.0'` lockfiles generated by pnpm v9. This causes `ERR_PNPM_BROKEN_LOCKFILE` in all repos still on pnpm v9 — confirmed breaking `broodly` main.
Fix
Pin to `pnpm/action-setup@v5.0.0` (`fc06bc1`), which installs pnpm directly via npm with no v11-rc bootstrap, restoring compatibility with pnpm v9.
Note
Upgrade to action-setup@v6 can be revisited org-wide once repos have migrated to pnpm v11.
Summary by CodeRabbit