Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,11 @@ jobs:
with:
node-version: '20'

- name: Install pnpm
uses: pnpm/action-setup@v6
- name: Enable Corepack
run: corepack enable

- name: Verify pnpm version
run: pnpm --version

- name: Get pnpm store directory
shell: bash
Expand All @@ -68,9 +71,9 @@ jobs:
uses: actions/cache@v5
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-v2-${{ hashFiles('**/pnpm-lock.yaml') }}
key: ${{ runner.os }}-pnpm-store-v3-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-v2-
${{ runner.os }}-pnpm-store-v3-

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down Expand Up @@ -105,8 +108,11 @@ jobs:
with:
node-version: '20'

- name: Install pnpm
uses: pnpm/action-setup@v6
- name: Enable Corepack
run: corepack enable

- name: Verify pnpm version
run: pnpm --version

- name: Get pnpm store directory
shell: bash
Expand All @@ -117,9 +123,9 @@ jobs:
uses: actions/cache@v5
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-v2-${{ hashFiles('**/pnpm-lock.yaml') }}
key: ${{ runner.os }}-pnpm-store-v3-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-v2-
${{ runner.os }}-pnpm-store-v3-

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down Expand Up @@ -168,8 +174,11 @@ jobs:
with:
node-version: '20'

- name: Install pnpm
uses: pnpm/action-setup@v6
- name: Enable Corepack
run: corepack enable

- name: Verify pnpm version
run: pnpm --version

- name: Get pnpm store directory
shell: bash
Expand All @@ -180,9 +189,9 @@ jobs:
uses: actions/cache@v5
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-v2-${{ hashFiles('**/pnpm-lock.yaml') }}
key: ${{ runner.os }}-pnpm-store-v3-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-v2-
${{ runner.os }}-pnpm-store-v3-

- name: Setup Next.js cache
uses: actions/cache@v5
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ jobs:
with:
node-version: '20'

- name: Install pnpm
uses: pnpm/action-setup@v6
- name: Enable Corepack
run: corepack enable

- name: Verify pnpm version
run: pnpm --version

- name: Get pnpm store directory
shell: bash
Expand All @@ -36,9 +39,9 @@ jobs:
uses: actions/cache@v5
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-v2-${{ hashFiles('**/pnpm-lock.yaml') }}
key: ${{ runner.os }}-pnpm-store-v3-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-v2-
${{ runner.os }}-pnpm-store-v3-

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-automation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ jobs:
with:
node-version: '20'

- name: Install pnpm
uses: pnpm/action-setup@v6
- name: Enable Corepack
run: corepack enable

- name: Install dependencies
run: pnpm install --frozen-lockfile
Comment on lines +68 to 72
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ jobs:
with:
node-version: '20'

- name: Install pnpm
uses: pnpm/action-setup@v6
- name: Enable Corepack
run: corepack enable

- name: Verify pnpm version
run: pnpm --version

- name: Get pnpm store directory
shell: bash
Expand All @@ -35,9 +38,9 @@ jobs:
uses: actions/cache@v5
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-v2-${{ hashFiles('**/pnpm-lock.yaml') }}
key: ${{ runner.os }}-pnpm-store-v3-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-v2-
${{ runner.os }}-pnpm-store-v3-

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/validate-deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ jobs:
with:
node-version: '20'

- name: Install pnpm
uses: pnpm/action-setup@v6
- name: Enable Corepack
run: corepack enable

- name: Verify pnpm version
run: pnpm --version

- name: Get pnpm store directory
shell: bash
Expand All @@ -39,9 +42,9 @@ jobs:
uses: actions/cache@v5
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-v2-${{ hashFiles('**/pnpm-lock.yaml') }}
key: ${{ runner.os }}-pnpm-store-v3-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-v2-
${{ runner.os }}-pnpm-store-v3-

- name: Verify lockfile is up to date
run: |
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]

### Fixed
- **CI: Replace `pnpm/action-setup@v6` with corepack** — Switched all GitHub Actions workflows (`ci.yml`, `lint.yml`, `release.yml`, `validate-deps.yml`, `pr-automation.yml`) from `pnpm/action-setup@v6` to `corepack enable` to fix persistent `ERR_PNPM_BROKEN_LOCKFILE` errors. Corepack reads the exact `packageManager` field from `package.json` (including SHA verification), ensuring the correct pnpm version is used in CI. Also bumped pnpm store cache keys to v3 and added a pnpm version verification step.
- **Broken pnpm lockfile** — Regenerated `pnpm-lock.yaml` from scratch to fix `ERR_PNPM_BROKEN_LOCKFILE` ("expected a single document in the stream, but found more") that was causing all CI jobs to fail. The previous merge of PR #1117 only included workflow cache key changes but did not carry over the regenerated lockfile.

### Added
Expand Down