Skip to content

fix: pin agent-shield reusable workflow to SHA#121

Closed
don-petry wants to merge 26 commits into
mainfrom
claude/issue-83-20260418-1846
Closed

fix: pin agent-shield reusable workflow to SHA#121
don-petry wants to merge 26 commits into
mainfrom
claude/issue-83-20260418-1846

Conversation

@don-petry

Copy link
Copy Markdown
Contributor

Summary

Pins the agent-shield-reusable.yml reusable workflow reference from the floating @v1 tag to its exact commit SHA ee22b427cbce9ecadcf2b436acb57c3adf0cb63d, with a # v1 comment preserved for human readability.

This satisfies the org action-pinning policy flagged by the weekly compliance audit.

Note: PR #98 addressed this same issue but used an older SHA (ae9709f4466dec60a5733c9e7487f69dcd004e05). The v1 tag has since been updated to ee22b427cbce9ecadcf2b436acb57c3adf0cb63d. This PR supersedes #98.

Changes

  • .github/workflows/agent-shield.yml: @v1@ee22b427cbce9ecadcf2b436acb57c3adf0cb63d # v1

Closes #83

Generated with Claude Code

Pin `agent-shield-reusable.yml` reference from floating `@v1` tag to
its exact commit SHA `ee22b427cbce9ecadcf2b436acb57c3adf0cb63d`, with
a `# v1` comment preserved for human readability.

Satisfies the org action-pinning policy flagged by the weekly compliance audit.

Co-authored-by: don-petry <don-petry@users.noreply.github.com>
Copilot AI review requested due to automatic review settings April 18, 2026 18:48
@coderabbitai

coderabbitai Bot commented Apr 18, 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 32 minutes and 49 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: 77938f44-6081-4ab6-9cd7-d1de297392c4

📥 Commits

Reviewing files that changed from the base of the PR and between abd3789 and 3a0b7b4.

📒 Files selected for processing (1)
  • .github/workflows/agent-shield.yml
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch claude/issue-83-20260418-1846

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.

@don-petry

Copy link
Copy Markdown
Contributor Author

@don-petry — PR is ready for review and merge. This pins the reusable workflow reference to the current v1 SHA to satisfy the compliance audit. PR #98 (same fix with an older SHA) can be closed once this one merges.

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

Note

Copilot was unable to run its full agentic suite in this review.

Pins the agent-shield reusable workflow reference to an immutable commit SHA to comply with the org action/workflow pinning policy and compliance audit findings.

Changes:

  • Replaced the floating @v1 reference with a specific commit SHA for agent-shield-reusable.yml
  • Preserved a # v1 comment for human readability while keeping the reference immutable

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

@github-actions github-actions Bot requested a review from a team as a code owner May 4, 2026 20:38
@don-petry don-petry closed this May 11, 2026
@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

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

@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

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

Copy link
Copy Markdown
Contributor

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: LOW
Reviewed commit: 3a0b7b4abf049415fa90f4c74137e3df073cda4c
Cascade: triage → deep (triage: haiku 4.5 → deep: sonnet 4.6 + duck: o4-mini → audit: opus 4.7)

Summary

This is a single-line compliance fix (pinning a reusable-workflow reference from @v1 to an exact SHA) that is technically correct, policy-compliant, and passes all CI checks. However the PR cannot be approved because it has been in a CONFLICTING/DIRTY merge state since 2026-05-19 — automated rebase has failed 15+ times — and the linked issue #83 is now CLOSED despite this PR never having merged, which raises the question of whether the fix already landed in main via another path and this branch is now fully superseded.

Findings

  • MAJOR: PR is CONFLICTING/DIRTY against main. Automated rebase has failed 15+ consecutive times (2026-05-19 through 2026-06-01). The branch cannot be merged without manual conflict resolution. The conflict is almost certainly in the single changed line of .github/workflows/agent-shield.yml, meaning main has since modified or replaced that line independently.
  • MAJOR: Linked issue Compliance: unpinned-actions-agent-shield.yml #83 (Compliance: unpinned-actions-agent-shield.yml) is now CLOSED despite this PR never merging. This strongly suggests the SHA-pinning fix already landed in main via a different commit or PR, making this branch entirely obsolete. Merging a conflicting branch that duplicates an already-merged fix could re-introduce a stale or incorrect SHA. Recommend verifying the current state of .github/workflows/agent-shield.yml on main before any further action.
  • INFO: The actual code change is correct and policy-compliant: @v1 → @ee22b427cbce9ecadcf2b436acb57c3adf0cb63d # v1 matches the org action-pinning standard exactly. CodeQL, SonarCloud, CodeRabbit, and AgentShield all passed. The prior automated review approved the code at the current head SHA (3a0b7b4).
  • INFO: All CI checks passed at the last tested commit (3a0b7b4, 2026-05-19): CodeQL SUCCESS, SonarCloud PASSED (0 new issues, 0 security hotspots), CodeRabbit SUCCESS, AgentShield SUCCESS. No security scanner warnings.

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 1, 2026 22:48

Superseded by automated re-review at 3a0b7b4.

@don-petry

Copy link
Copy Markdown
Contributor Author

Closing due to merge conflict that cannot be auto-rebased. Re-implementing from fresh main via dev-lead.

@don-petry don-petry closed this Jun 2, 2026
auto-merge was automatically disabled June 2, 2026 12:18

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.

Compliance: unpinned-actions-agent-shield.yml

4 participants