Skip to content

Commit e86af34

Browse files
Fix solidus frontend branch name
Solidus frontend doesn't have newer versions so specifying the branch for new versions won't work. If the branch is too high it will just error because it doesn't exist.
1 parent 1e0ea92 commit e86af34

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

Gemfile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@ source 'https://rubygems.org'
44
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
55

66
branch = ENV.fetch('SOLIDUS_BRANCH', 'main')
7-
solidus_git, solidus_frontend_git = if (branch == 'main') || (branch >= 'v3.2')
8-
%w[solidusio/solidus solidusio/solidus_frontend]
9-
else
10-
%w[solidusio/solidus] * 2
11-
end
12-
gem 'solidus', github: solidus_git, branch: branch
13-
gem 'solidus_frontend', github: solidus_frontend_git, branch: branch
7+
8+
gem 'solidus', github: 'solidusio/solidus', branch: branch
9+
10+
# The `solidus_frontend` gem is deprecated and isn't expected to have major
11+
# version updates after v3.2.
12+
if branch >= 'v3.2'
13+
gem 'solidus_frontend'
14+
elsif branch == 'main'
15+
gem 'solidus_frontend', github: 'solidusio/solidus_frontend', branch: branch
16+
else
17+
gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
18+
end
1419

1520
# Needed to help Bundler figure out how to resolve dependencies,
1621
# otherwise it takes forever to resolve them.

0 commit comments

Comments
 (0)