Skip to content

Commit 7d3ab83

Browse files
committed
Fix Pro gemspec paths after Phase 6 restructure
After Phase 6 moved the gemspec to the root, all dummy app Gemfiles and CI workflows need to reference the correct paths. Changes: - Pro dummy Gemfiles: Change path from ../.. to ../../.. to reach repo root - CI workflow cache keys: Fix gemspec path from react_on_rails_pro/react_on_rails_pro.gemspec to react_on_rails_pro.gemspec Fixes pro-lint-js-and-ruby, build-dummy-app-webpack-test-bundles failures.
1 parent aa2f465 commit 7d3ab83

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ jobs:
213213
uses: actions/cache@v4
214214
with:
215215
path: react_on_rails_pro/vendor/bundle
216-
key: v4-pro-package-gem-cache-${{ hashFiles('react_on_rails_pro/react_on_rails_pro.gemspec') }}
216+
key: v4-pro-package-gem-cache-${{ hashFiles('react_on_rails_pro.gemspec') }}
217217

218218
- name: Cache Pro package node modules
219219
uses: actions/cache@v4
@@ -412,7 +412,7 @@ jobs:
412412
uses: actions/cache@v4
413413
with:
414414
path: react_on_rails_pro/vendor/bundle
415-
key: v4-pro-package-gem-cache-${{ hashFiles('react_on_rails_pro/react_on_rails_pro.gemspec') }}
415+
key: v4-pro-package-gem-cache-${{ hashFiles('react_on_rails_pro.gemspec') }}
416416

417417
- name: Cache Pro package node modules
418418
uses: actions/cache@v4

.github/workflows/pro-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
uses: actions/cache@v4
120120
with:
121121
path: react_on_rails_pro/vendor/bundle
122-
key: v4-pro-package-gem-cache-${{ hashFiles('react_on_rails_pro/react_on_rails_pro.gemspec') }}
122+
key: v4-pro-package-gem-cache-${{ hashFiles('react_on_rails_pro.gemspec') }}
123123

124124
- name: Cache Pro dummy app node modules
125125
uses: actions/cache@v4

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ jobs:
295295
uses: actions/cache@v4
296296
with:
297297
path: react_on_rails_pro/vendor/bundle
298-
key: v4-pro-package-gem-cache-ruby${{ matrix.ruby-version }}-${{ hashFiles('react_on_rails_pro/react_on_rails_pro.gemspec') }}
298+
key: v4-pro-package-gem-cache-ruby${{ matrix.ruby-version }}-${{ hashFiles('react_on_rails_pro.gemspec') }}
299299

300300
- name: Install Ruby Gems for Pro package
301301
run: |

react_on_rails_pro/spec/dummy/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ source "https://rubygems.org"
55
ENV["SPEC_DUMMY"] = "yes"
66
eval_gemfile File.expand_path("../../Gemfile.loader", __dir__)
77

8-
gem "react_on_rails_pro", path: "../.."
8+
gem "react_on_rails_pro", path: "../../.."
99

1010
gem "graphql"
1111
gem "prism-rails"

react_on_rails_pro/spec/execjs-compatible-dummy/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ end
6464
gem "shakapacker", "= 8.0"
6565

6666
gem "react_on_rails", path: "../../.."
67-
gem "react_on_rails_pro", path: "../.."
67+
gem "react_on_rails_pro", path: "../../.."

0 commit comments

Comments
 (0)