Skip to content

Commit

Permalink
Update lockfiles to support linux, ruby platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianna-chang-shopify authored and etiennebarrie committed Mar 31, 2021
1 parent f8e4162 commit cd700ab
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem "capybara"
gem "mocha"
gem "pry-byebug"
gem "puma"
gem "rails", $rails_gem_requirement
gem "rails", defined?(@rails_gem_requirement) && @rails_gem_requirement
gem "rubocop-shopify"
gem "selenium-webdriver"
gem "sqlite3"
Expand Down
6 changes: 6 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ GEM
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.11.2-x86_64-linux)
racc (~> 1.4)
parallel (1.20.1)
parser (3.0.0.0)
ast (~> 2.4.1)
Expand Down Expand Up @@ -199,6 +203,8 @@ GEM

PLATFORMS
ruby
x86_64-darwin-19
x86_64-linux

DEPENDENCIES
capybara
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6_0.gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

$rails_gem_requirement = "~> 6.0.0"
@rails_gem_requirement = "~> 6.0.0"

eval_gemfile "../Gemfile"
8 changes: 8 additions & 0 deletions gemfiles/rails_6_0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,17 @@ GEM
marcel (1.0.0)
method_source (1.0.0)
mini_mime (1.0.3)
mini_portile2 (2.5.0)
minitest (5.14.4)
mocha (1.12.0)
nio4r (2.5.7)
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.11.2-x86_64-linux)
racc (~> 1.4)
parallel (1.20.1)
parser (3.0.0.0)
ast (~> 2.4.1)
Expand Down Expand Up @@ -193,7 +199,9 @@ GEM
zeitwerk (2.4.2)

PLATFORMS
ruby
x86_64-darwin-19
x86_64-linux

DEPENDENCIES
capybara
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_edge.gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

$rails_gem_requirement = { github: "rails/rails" }
@rails_gem_requirement = { github: "rails/rails" }

eval_gemfile "../Gemfile"
8 changes: 8 additions & 0 deletions gemfiles/rails_edge.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,17 @@ GEM
marcel (1.0.0)
method_source (1.0.0)
mini_mime (1.0.3)
mini_portile2 (2.5.0)
minitest (5.14.4)
mocha (1.12.0)
nio4r (2.5.7)
nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
nokogiri (1.11.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.11.2-x86_64-linux)
racc (~> 1.4)
parallel (1.20.1)
parser (3.0.0.0)
ast (~> 2.4.1)
Expand Down Expand Up @@ -201,7 +207,9 @@ GEM
zeitwerk (2.4.2)

PLATFORMS
ruby
x86_64-darwin-19
x86_64-linux

DEPENDENCIES
capybara
Expand Down

0 comments on commit cd700ab

Please sign in to comment.