Skip to content

Commit 1f08865

Browse files
committed
Merge pull request #1125 from bf4/no_fail_coverage_by_platform
Simplify Windows platform identification in Gemfile
2 parents f2d0a91 + bd80c19 commit 1f08865

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

Gemfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,21 @@ else
2929
gem 'actionpack', gem_version
3030
end
3131

32+
# https://github.com/bundler/bundler/blob/89a8778c19269561926cea172acdcda241d26d23/lib/bundler/dependency.rb#L30-L54
33+
@windows_platforms = [:mswin, :mingw, :x64_mingw]
34+
35+
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
36+
gem 'tzinfo-data', platforms: (@windows_platforms + [:jruby])
37+
3238
group :test do
3339
gem 'activerecord'
34-
gem 'sqlite3', platform: [:ruby, :mingw, :x64_mingw, :mswin]
40+
gem 'sqlite3', platform: (@windows_platforms + [:ruby])
3541
gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
36-
gem 'codeclimate-test-reporter', require: false
37-
end
3842

39-
group :test, :development do
40-
gem 'simplecov', '~> 0.10', require: false
43+
gem 'codeclimate-test-reporter', require: false
44+
gem 'simplecov', '~> 0.10', require: false, group: :development
4145
end
4246

43-
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
44-
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
45-
4647
group :development, :test do
4748
gem 'rubocop', '~> 0.34.0', require: false
4849
end

appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ install:
1717
- gem --version
1818
- gem install bundler
1919
- bundler --version
20+
- bundle platform
2021
- bundle install --retry=3
2122

2223
test_script:

0 commit comments

Comments
 (0)