Skip to content

Commit 6385cf6

Browse files
authored
Merge pull request #241 from solidusio/waiting-for-dev/fix_ci_on_solidus_v3.1
Fix CI on Solidus v3.1 by explicitly fetching solidus_frontend from GH
2 parents 3fed000 + c2d8373 commit 6385cf6

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

Gemfile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ gem 'solidus', github: 'solidusio/solidus', branch: branch
88
gem 'solidus_backend', github: 'solidusio/solidus', branch: branch
99

1010
# The solidus_frontend gem has been pulled out since v3.2
11-
gem 'solidus_frontend', github: 'solidusio/solidus_frontend' if branch == 'master'
12-
gem 'solidus_frontend' if branch >= 'v3.2' # rubocop:disable Bundler/DuplicatedGem
11+
if branch >= 'v3.2'
12+
gem 'solidus_frontend'
13+
elsif branch == 'master'
14+
gem 'solidus_frontend', github: 'solidusio/solidus_frontend'
15+
else
16+
gem 'solidus_frontend', github: 'solidusio/solidus', branch: branch
17+
end
1318

1419
case ENV.fetch('DB', nil)
1520
when 'mysql'

0 commit comments

Comments
 (0)