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
6 changes: 2 additions & 4 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,8 @@ jobs:
# Use --link to maintain the link: protocol that matches pnpm-lock.yaml
run: cd react_on_rails/spec/dummy && yalc add --link react-on-rails
- name: Install Node modules with pnpm for dummy app
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
# minimum config changes package.json (shakapacker version), so can't use frozen lockfile
run: cd react_on_rails/spec/dummy && pnpm install --ignore-workspace ${{ matrix.dependency-level == 'minimum' && '--no-frozen-lockfile' || '' }}
run: cd react_on_rails/spec/dummy && pnpm install ${{ matrix.dependency-level == 'minimum' && '--no-frozen-lockfile' || '--frozen-lockfile' }}
- name: Save dummy app ruby gems to cache
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -260,9 +259,8 @@ jobs:
# Use --link to maintain the link: protocol that matches pnpm-lock.yaml
run: cd react_on_rails/spec/dummy && yalc add --link react-on-rails
- name: Install Node modules with pnpm for dummy app
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
# minimum config changes package.json (shakapacker version), so can't use frozen lockfile
run: cd react_on_rails/spec/dummy && pnpm install --ignore-workspace ${{ matrix.dependency-level == 'minimum' && '--no-frozen-lockfile' || '' }}
run: cd react_on_rails/spec/dummy && pnpm install ${{ matrix.dependency-level == 'minimum' && '--no-frozen-lockfile' || '--frozen-lockfile' }}
- name: Dummy JS tests
run: |
cd react_on_rails/spec/dummy
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/lint-js-and-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,7 @@ jobs:
# Use --link to maintain the link: protocol that matches pnpm-lock.yaml
run: cd react_on_rails/spec/dummy && yalc add --link react-on-rails
- name: Install Node modules with pnpm for dummy app
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
# The dummy app has its own dependencies and uses yalc links
run: cd react_on_rails/spec/dummy && pnpm install --ignore-workspace
run: cd react_on_rails/spec/dummy && pnpm install

- name: Install Ruby Gems for package
run: cd react_on_rails && bundle check --path=vendor/bundle || bundle _2.5.9_ install --path=vendor/bundle --jobs=4 --retry=3
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/playwright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,9 @@ jobs:

- name: Install dummy app dependencies
working-directory: react_on_rails/spec/dummy
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
run: |
bundle install
pnpm install --ignore-workspace
pnpm install

- name: Install Playwright browsers
working-directory: react_on_rails/spec/dummy
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/precompile-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,9 @@ jobs:
- name: yalc publish for react-on-rails
run: cd packages/react-on-rails && yalc publish
- name: yalc add react-on-rails
run: cd react_on_rails/spec/dummy && yalc add react-on-rails
run: cd react_on_rails/spec/dummy && yalc add --link react-on-rails
- name: Install Node modules with pnpm for dummy app
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
# The dummy app doesn't have a pnpm-lock.yaml
run: cd react_on_rails/spec/dummy && pnpm install --ignore-workspace
run: cd react_on_rails/spec/dummy && pnpm install
- name: Save dummy app ruby gems to cache
uses: actions/cache@v4
with:
Expand Down
12 changes: 3 additions & 9 deletions .github/workflows/pro-integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,7 @@ jobs:
pnpm install --frozen-lockfile

- name: Install Node modules with pnpm for Pro dummy app
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
# The Pro dummy app has its own dependencies and uses yalc links
run: cd spec/dummy && pnpm install --ignore-workspace
run: cd spec/dummy && pnpm install

- name: Install Ruby Gems for Pro dummy app
run: |
Expand Down Expand Up @@ -266,9 +264,7 @@ jobs:
pnpm install --frozen-lockfile

- name: Install Node modules with pnpm for Pro dummy app
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
# The Pro dummy app has its own dependencies and uses yalc links
run: cd spec/dummy && pnpm install --ignore-workspace
run: cd spec/dummy && pnpm install

- name: Ensure minimum required Chrome version
run: |
Expand Down Expand Up @@ -468,9 +464,7 @@ jobs:
pnpm install --frozen-lockfile

- name: Install Node modules with pnpm for Pro dummy app
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
# The Pro dummy app has its own dependencies and uses yalc links
run: cd spec/dummy && pnpm install --ignore-workspace
run: cd spec/dummy && pnpm install

- name: Ensure minimum required Chrome version
run: |
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/pro-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,12 +154,10 @@ jobs:
bundle _2.5.4_ check || bundle _2.5.4_ install --jobs=4 --retry=3

- name: Install Node modules with pnpm for Pro dummy app
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
run: cd spec/dummy && pnpm install --ignore-workspace
run: cd spec/dummy && pnpm install

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

- name: Generate file-system based entrypoints
run: cd spec/dummy && bundle exec rake react_on_rails:generate_packs
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/pro-test-package-and-gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,7 @@ jobs:
pnpm install --frozen-lockfile

- name: Install Node modules with pnpm for Pro dummy app
# --ignore-workspace prevents pnpm from treating this as part of the parent workspace
run: cd spec/dummy && pnpm install --ignore-workspace
run: cd spec/dummy && pnpm install

- name: Install Ruby Gems for Pro dummy app
run: |
Expand Down
Loading
Loading