File tree Expand file tree Collapse file tree 7 files changed +10
-26
lines changed
Expand file tree Collapse file tree 7 files changed +10
-26
lines changed Original file line number Diff line number Diff line change @@ -153,9 +153,8 @@ jobs:
153153 # Use --link to maintain the link: protocol that matches pnpm-lock.yaml
154154 run : cd react_on_rails/spec/dummy && yalc add --link react-on-rails
155155 - name : Install Node modules with pnpm for dummy app
156- # --ignore-workspace prevents pnpm from treating this as part of the parent workspace
157156 # minimum config changes package.json (shakapacker version), so can't use frozen lockfile
158- run : cd react_on_rails/spec/dummy && pnpm install --ignore-workspace ${{ matrix.dependency-level == 'minimum' && '--no-frozen-lockfile' || '' }}
157+ run : cd react_on_rails/spec/dummy && pnpm install ${{ matrix.dependency-level == 'minimum' && '--no-frozen-lockfile' || '' }}
159158 - name : Save dummy app ruby gems to cache
160159 uses : actions/cache@v4
161160 with :
@@ -260,9 +259,8 @@ jobs:
260259 # Use --link to maintain the link: protocol that matches pnpm-lock.yaml
261260 run : cd react_on_rails/spec/dummy && yalc add --link react-on-rails
262261 - name : Install Node modules with pnpm for dummy app
263- # --ignore-workspace prevents pnpm from treating this as part of the parent workspace
264262 # minimum config changes package.json (shakapacker version), so can't use frozen lockfile
265- run : cd react_on_rails/spec/dummy && pnpm install --ignore-workspace ${{ matrix.dependency-level == 'minimum' && '--no-frozen-lockfile' || '' }}
263+ run : cd react_on_rails/spec/dummy && pnpm install ${{ matrix.dependency-level == 'minimum' && '--no-frozen-lockfile' || '' }}
266264 - name : Dummy JS tests
267265 run : |
268266 cd react_on_rails/spec/dummy
Original file line number Diff line number Diff line change @@ -135,9 +135,7 @@ jobs:
135135 # Use --link to maintain the link: protocol that matches pnpm-lock.yaml
136136 run : cd react_on_rails/spec/dummy && yalc add --link react-on-rails
137137 - name : Install Node modules with pnpm for dummy app
138- # --ignore-workspace prevents pnpm from treating this as part of the parent workspace
139- # The dummy app has its own dependencies and uses yalc links
140- run : cd react_on_rails/spec/dummy && pnpm install --ignore-workspace
138+ run : cd react_on_rails/spec/dummy && pnpm install
141139
142140 - name : Install Ruby Gems for package
143141 run : cd react_on_rails && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
Original file line number Diff line number Diff line change 7676
7777 - name : Install dummy app dependencies
7878 working-directory : react_on_rails/spec/dummy
79- # --ignore-workspace prevents pnpm from treating this as part of the parent workspace
8079 run : |
8180 bundle install
82- pnpm install --ignore-workspace
81+ pnpm install
8382
8483 - name : Install Playwright browsers
8584 working-directory : react_on_rails/spec/dummy
Original file line number Diff line number Diff line change @@ -115,9 +115,7 @@ jobs:
115115 - name : yalc add react-on-rails
116116 run : cd react_on_rails/spec/dummy && yalc add --link react-on-rails
117117 - name : Install Node modules with pnpm for dummy app
118- # --ignore-workspace prevents pnpm from treating this as part of the parent workspace
119- # The dummy app doesn't have a pnpm-lock.yaml
120- run : cd react_on_rails/spec/dummy && pnpm install --ignore-workspace
118+ run : cd react_on_rails/spec/dummy && pnpm install
121119 - name : Save dummy app ruby gems to cache
122120 uses : actions/cache@v4
123121 with :
Original file line number Diff line number Diff line change @@ -136,8 +136,6 @@ jobs:
136136 pnpm install --frozen-lockfile
137137
138138 - name : Install Node modules with pnpm for Pro dummy app
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
141139 run : |
142140 pwd
143141 cd spec/dummy && pnpm install
@@ -268,9 +266,7 @@ jobs:
268266 pnpm install --frozen-lockfile
269267
270268 - name : Install Node modules with pnpm for Pro dummy app
271- # --ignore-workspace prevents pnpm from treating this as part of the parent workspace
272- # The Pro dummy app has its own dependencies and uses yalc links
273- run : cd spec/dummy && pnpm install --ignore-workspace
269+ run : cd spec/dummy && pnpm install
274270
275271 - name : Ensure minimum required Chrome version
276272 run : |
@@ -470,9 +466,7 @@ jobs:
470466 pnpm install --frozen-lockfile
471467
472468 - name : Install Node modules with pnpm for Pro dummy app
473- # --ignore-workspace prevents pnpm from treating this as part of the parent workspace
474- # The Pro dummy app has its own dependencies and uses yalc links
475- run : cd spec/dummy && pnpm install --ignore-workspace
469+ run : cd spec/dummy && pnpm install
476470
477471 - name : Ensure minimum required Chrome version
478472 run : |
Original file line number Diff line number Diff line change @@ -154,12 +154,10 @@ jobs:
154154 bundle _2.5.4_ check || bundle _2.5.4_ install --jobs=4 --retry=3
155155
156156 - name : Install Node modules with pnpm for Pro dummy app
157- # --ignore-workspace prevents pnpm from treating this as part of the parent workspace
158- run : cd spec/dummy && pnpm install --ignore-workspace
157+ run : cd spec/dummy && pnpm install
159158
160159 - name : Install Node modules with pnpm for ExecJS dummy app
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
160+ run : cd spec/execjs-compatible-dummy && pnpm install
163161
164162 - name : Generate file-system based entrypoints
165163 run : cd spec/dummy && bundle exec rake react_on_rails:generate_packs
Original file line number Diff line number Diff line change @@ -136,8 +136,7 @@ jobs:
136136 pnpm install --frozen-lockfile
137137
138138 - name : Install Node modules with pnpm for Pro dummy app
139- # --ignore-workspace prevents pnpm from treating this as part of the parent workspace
140- run : cd spec/dummy && pnpm install --ignore-workspace
139+ run : cd spec/dummy && pnpm install
141140
142141 - name : Install Ruby Gems for Pro dummy app
143142 run : |
You can’t perform that action at this time.
0 commit comments