Skip to content

Commit 3addfb3

Browse files
authored
Merge pull request #227 from solidusio/waiting-for-dev/support_forked_solidus_frontend
Update to use forked solidus_frontend when needed
2 parents 2ee5d52 + c424d42 commit 3addfb3

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

Gemfile

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

66
branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
77

8-
git "https://github.com/solidusio/solidus.git", branch: branch do
9-
gem 'solidus_api'
10-
gem 'solidus_backend'
11-
gem 'solidus_core'
12-
gem 'solidus_frontend'
13-
gem 'solidus_sample'
14-
end
8+
solidus_git, solidus_frontend_git = if (branch == 'master') || (branch >= 'v3.2')
9+
%w[solidusio/solidus solidusio/solidus_frontend]
10+
else
11+
%w[solidusio/solidus] * 2
12+
end
13+
14+
gem 'solidus_api', github: solidus_git, branch: branch
15+
gem 'solidus_backend', github: solidus_git, branch: branch
16+
gem 'solidus_core', github: solidus_git, branch: branch
17+
gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
18+
gem 'solidus_sample', github: solidus_git, branch: branch
1519

1620
gem 'rails', ENV.fetch('RAILS_VERSION', nil)
1721

0 commit comments

Comments
 (0)