Resolve PR #705 workflow merge conflicts and pin pnpm action to immutable v5 SHA#707
Merged
Merged
Conversation
fix: pin pnpm action in workflows Agent-Logs-Url: https://github.com/z-shell/wiki/sessions/bd69b14f-ad5b-4221-a431-efaef7777bf6 Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: ss-o <59910950+ss-o@users.noreply.github.com>
Agent-Logs-Url: https://github.com/z-shell/wiki/sessions/e6834102-e5ec-42c9-a1a7-6228d6a0f17b Co-authored-by: ss-o <59910950+ss-o@users.noreply.github.com>
…entation-plan-for-pr-705 Co-authored-by: ss-o <59910950+ss-o@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
ss-o
April 29, 2026 04:22
View session
Contributor
There was a problem hiding this comment.
Pull request overview
This PR resolves workflow merge conflicts while hardening CI against supply-chain risks by pinning pnpm/action-setup to an immutable commit SHA across the repo’s GitHub Actions workflows and shared Trunk composite action.
Changes:
- Pin
pnpm/action-setupfrom the floating@v5tag to commitfc06bc1257f339d1d5d8b3a19a8cae5388b55320in workflows. - Apply the same pin in the shared
.trunk/setup-cicomposite action to prevent reintroducing the finding via reuse.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
.trunk/setup-ci/action.yml |
Pins pnpm/action-setup to an immutable SHA in the shared CI setup action. |
.github/workflows/pages-deployment.yml |
Pins pnpm/action-setup to an immutable SHA in the Pages deployment workflow. |
.github/workflows/ci-perf.yml |
Pins pnpm/action-setup to an immutable SHA in both perf jobs. |
ss-o
approved these changes
Apr 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This updates the PR #705 branch to absorb the latest
mainworkflow changes without dropping the newer branch-specific workflow updates. It also removes the remaining CodeQL finding by replacing floatingpnpm/action-setuptags with an immutablev5commit pin.Conflict resolution
mainbranch workflow changes into the PR branch in the two files that were actually blocking merge:.github/workflows/ci-perf.yml.github/workflows/pages-deployment.ymlactions/checkout@v6,actions/setup-node@v6, added permissions,.ymldeployment workflow path).Workflow supply-chain hardening
pnpm/action-setup@v5references with the immutablev5commit:.github/workflows/ci-perf.yml.github/workflows/pages-deployment.yml.trunk/setup-ci/action.ymlMerge normalization
.github/workflows/pages-deployment.ymlfilename while folding in themainbranch’s pinned-action security fix.