Skip to content

Commit 491348a

Browse files
justin808claude
andcommitted
Fix pnpm/action-setup version conflict
Remove explicit version: 9 parameter from pnpm/action-setup@v4 steps. The action reads the version from packageManager field in package.json, and specifying both causes a conflict error. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
1 parent d92e41e commit 491348a

File tree

8 files changed

+365
-70
lines changed

8 files changed

+365
-70
lines changed

.github/workflows/examples.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ jobs:
118118
node-version: 20
119119
- name: Setup pnpm
120120
uses: pnpm/action-setup@v4
121-
with:
122-
version: 9
123121
- name: Get pnpm store directory
124122
shell: bash
125123
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

.github/workflows/lint-js-and-ruby.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ jobs:
100100
node-version: '22.11.0'
101101
- name: Setup pnpm
102102
uses: pnpm/action-setup@v4
103-
with:
104-
version: 9
105103
- name: Get pnpm store directory
106104
shell: bash
107105
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
@@ -136,7 +134,9 @@ jobs:
136134
- name: yalc add react-on-rails
137135
run: cd react_on_rails/spec/dummy && yalc add react-on-rails
138136
- name: Install Node modules with pnpm for dummy app
139-
run: cd react_on_rails/spec/dummy && pnpm install --frozen-lockfile
137+
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
138+
# The dummy app has its own dependencies and uses yalc links
139+
run: cd react_on_rails/spec/dummy && pnpm install --ignore-workspace
140140

141141
- name: Install Ruby Gems for package
142142
run: cd react_on_rails && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
@@ -164,8 +164,8 @@ jobs:
164164
run: cd react_on_rails/spec/dummy && RAILS_ENV="test" bundle exec rake react_on_rails:generate_packs
165165
- name: Detect dead code
166166
run: |
167-
pnpm run knip --exclude binaries
168-
pnpm run knip --production --exclude binaries
167+
pnpm exec knip --exclude binaries
168+
pnpm exec knip --production --exclude binaries
169169
170170
- name: Lint JS
171171
run: pnpm run eslint --report-unused-disable-directives

.github/workflows/package-js-tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,6 @@ jobs:
100100
node-version: ${{ matrix.node-version }}
101101
- name: Setup pnpm
102102
uses: pnpm/action-setup@v4
103-
with:
104-
version: 9
105103
- name: Get pnpm store directory
106104
shell: bash
107105
run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV

.github/workflows/playwright.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ jobs:
5555

5656
- name: Setup pnpm
5757
uses: pnpm/action-setup@v4
58-
with:
59-
version: 9
6058

6159
- name: Get pnpm store directory
6260
shell: bash
@@ -78,30 +76,29 @@ jobs:
7876

7977
- name: Install dummy app dependencies
8078
working-directory: react_on_rails/spec/dummy
79+
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
8180
run: |
8281
bundle install
83-
pnpm install
82+
pnpm install --ignore-workspace
8483
8584
- name: Install Playwright browsers
86-
working-directory: spec/dummy
85+
working-directory: react_on_rails/spec/dummy
8786
run: pnpm exec playwright install --with-deps
8887

89-
9088
- name: Generate React on Rails packs
9189
working-directory: react_on_rails/spec/dummy
9290
env:
9391
RAILS_ENV: test
9492
run: bundle exec rake react_on_rails:generate_packs
9593

9694
- name: Build test assets
97-
working-directory: spec/dummy
95+
working-directory: react_on_rails/spec/dummy
9896
run: pnpm run build:test
9997

10098
- name: Run Playwright tests
101-
working-directory: spec/dummy
99+
working-directory: react_on_rails/spec/dummy
102100
run: pnpm run test:e2e
103101

104-
105102
- uses: actions/upload-artifact@v4
106103
if: always()
107104
with:

.github/workflows/pro-integration-tests.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ jobs:
101101

102102
- name: Setup pnpm
103103
uses: pnpm/action-setup@v4
104-
with:
105-
version: 9
106104

107105
- name: Get pnpm store directory
108106
shell: bash
@@ -138,7 +136,9 @@ jobs:
138136
pnpm install --frozen-lockfile
139137
140138
- name: Install Node modules with pnpm for Pro dummy app
141-
run: cd spec/dummy && pnpm install --frozen-lockfile
139+
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
140+
# The Pro dummy app has its own dependencies and uses yalc links
141+
run: cd spec/dummy && pnpm install --ignore-workspace
142142

143143
- name: Install Ruby Gems for Pro dummy app
144144
run: |
@@ -202,8 +202,6 @@ jobs:
202202

203203
- name: Setup pnpm
204204
uses: pnpm/action-setup@v4
205-
with:
206-
version: 9
207205

208206
- name: Get pnpm store directory
209207
shell: bash
@@ -268,7 +266,9 @@ jobs:
268266
pnpm install --frozen-lockfile
269267
270268
- name: Install Node modules with pnpm for Pro dummy app
271-
run: cd spec/dummy && pnpm install --frozen-lockfile
269+
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
270+
# The Pro dummy app has its own dependencies and uses yalc links
271+
run: cd spec/dummy && pnpm install --ignore-workspace
272272

273273
- name: Ensure minimum required Chrome version
274274
run: |
@@ -404,8 +404,6 @@ jobs:
404404

405405
- name: Setup pnpm
406406
uses: pnpm/action-setup@v4
407-
with:
408-
version: 9
409407

410408
- name: Get pnpm store directory
411409
shell: bash
@@ -470,7 +468,9 @@ jobs:
470468
pnpm install --frozen-lockfile
471469
472470
- name: Install Node modules with pnpm for Pro dummy app
473-
run: cd spec/dummy && pnpm install --frozen-lockfile
471+
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
472+
# The Pro dummy app has its own dependencies and uses yalc links
473+
run: cd spec/dummy && pnpm install --ignore-workspace
474474

475475
- name: Ensure minimum required Chrome version
476476
run: |

.github/workflows/pro-lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ jobs:
9999

100100
- name: Setup pnpm
101101
uses: pnpm/action-setup@v4
102-
with:
103-
version: 9
104102

105103
- name: Get pnpm store directory
106104
shell: bash
@@ -156,10 +154,12 @@ jobs:
156154
bundle _2.5.4_ check || bundle _2.5.4_ install --jobs=4 --retry=3
157155
158156
- name: Install Node modules with pnpm for Pro dummy app
159-
run: cd spec/dummy && pnpm install --frozen-lockfile
157+
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
158+
run: cd spec/dummy && pnpm install --ignore-workspace
160159

161160
- name: Install Node modules with pnpm for ExecJS dummy app
162-
run: cd spec/execjs-compatible-dummy && pnpm install --frozen-lockfile
161+
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
162+
run: cd spec/execjs-compatible-dummy && pnpm install --ignore-workspace
163163

164164
- name: Generate file-system based entrypoints
165165
run: cd spec/dummy && bundle exec rake react_on_rails:generate_packs

.github/workflows/pro-test-package-and-gem.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ jobs:
101101

102102
- name: Setup pnpm
103103
uses: pnpm/action-setup@v4
104-
with:
105-
version: 9
106104

107105
- name: Get pnpm store directory
108106
shell: bash
@@ -208,8 +206,6 @@ jobs:
208206

209207
- name: Setup pnpm
210208
uses: pnpm/action-setup@v4
211-
with:
212-
version: 9
213209

214210
- name: Get pnpm store directory
215211
shell: bash

0 commit comments

Comments
 (0)