Skip to content

Commit e993f41

Browse files
CI: fix dependency pinning (#531)
* adjust pinning of test dependencies to ensure Active Record 5 is used * declare gems dependency on railties * adjust pinning to help bundler resolve mongoid 7 deps * update pin on Rails 5 * configure hakiri to use gemspec * Revert "declare gems dependency on railties" This reverts commit f120c5b. * pin version of pry to one that supports ruby 2.3
1 parent 8f559f1 commit e993f41

8 files changed

+30
-22
lines changed

.hakiri.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
dependency_source: gemspec_file

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ gemfile:
2222
- gemfiles/mongoid_6.gemfile
2323
- gemfiles/mongoid_7.gemfile
2424

25-
env:
25+
env:
2626
- ADAPTER=active_record
2727
- ADAPTER=mongoid
2828

Appraisals

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
appraise 'mongoid-6' do
22
gem "mongoid", "~> 6"
3-
gem "bson_ext", :platform => "ruby"
3+
gem "bson_ext", "1.5.1"
44
end
55

66
appraise 'mongoid-7' do
77
gem "mongoid", "~> 7"
8-
gem "bson_ext", :platform => "ruby"
8+
gem "bson_ext", "1.5.1"
9+
gem "railties", "5.2.4.1"
910
end
1011

1112
appraise 'activerecord-4' do
12-
gem "sqlite3", "~> 1.3.6", :platform => "ruby"
13+
gem "sqlite3", "~> 1.3.6"
1314
gem "activerecord", "~> 4.2.11", :require => "active_record"
1415
end
1516

1617
appraise 'activerecord-5' do
17-
gem "sqlite3", "~> 1.3.6", :platform => "ruby"
18-
gem "activerecord", ">= 5.2.0", :require => "active_record"
18+
gem "sqlite3", "~> 1.3.6"
19+
gem "activerecord", "~> 5.2.4", :require => "active_record"
1920

2021
# Ammeter dependencies:
21-
gem "actionpack", ">= 5.2.0"
22-
gem "activemodel", ">= 5.2.0"
23-
gem "railties", ">= 5.2.0"
22+
gem "actionpack", "~> 5.2.4"
23+
gem "activemodel", "~> 5.2.4"
24+
gem "railties", "~> 5.2.4"
2425

2526
gem 'rspec-rails' , github: 'rspec/rspec-rails'
2627
gem 'rspec-core' , github: 'rspec/rspec-core'

Gemfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ group :test do
44
gem 'appraisal'
55
gem 'coveralls', :require => false
66
gem 'its'
7+
gem 'pry', '< 0.13.0' # pry pins can be removed when we drop Ruby 2.3
78
gem 'byebug'
8-
gem 'pry-byebug'
9+
gem 'pry-byebug', '< 3.8.0'
910
gem 'test-unit' # Implicitly loaded by ammeter
1011
gem 'database_cleaner', '~> 1.6.2'
1112
gem 'codeclimate-test-reporter', :require => nil

gemfiles/activerecord_4.gemfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", "~> 1.3.6", platform: "ruby"
5+
gem "sqlite3", "~> 1.3.6"
66
gem "activerecord", "~> 4.2.11", require: "active_record"
77

88
group :test do
99
gem "appraisal"
1010
gem "coveralls", require: false
1111
gem "its"
12+
gem "pry", "< 0.13.0"
1213
gem "byebug"
13-
gem "pry-byebug"
14+
gem "pry-byebug", "< 3.8.0"
1415
gem "test-unit"
1516
gem "database_cleaner", "~> 1.6.2"
1617
gem "codeclimate-test-reporter", require: nil

gemfiles/activerecord_5.gemfile

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
source "https://rubygems.org"
44

5-
gem "sqlite3", "~> 1.3.6", platform: "ruby"
6-
gem "activerecord", ">= 5.2.0", require: "active_record"
7-
gem "actionpack", ">= 5.2.0"
8-
gem "activemodel", ">= 5.2.0"
9-
gem "railties", ">= 5.2.0"
5+
gem "sqlite3", "~> 1.3.6"
6+
gem "activerecord", "~> 5.2.4", require: "active_record"
7+
gem "actionpack", "~> 5.2.4"
8+
gem "activemodel", "~> 5.2.4"
9+
gem "railties", "~> 5.2.4"
1010
gem "rspec-rails", github: "rspec/rspec-rails"
1111
gem "rspec-core", github: "rspec/rspec-core"
1212
gem "rspec-expectations", github: "rspec/rspec-expectations"
@@ -17,8 +17,9 @@ group :test do
1717
gem "appraisal"
1818
gem "coveralls", require: false
1919
gem "its"
20+
gem "pry", "< 0.13.0"
2021
gem "byebug"
21-
gem "pry-byebug"
22+
gem "pry-byebug", "< 3.8.0"
2223
gem "test-unit"
2324
gem "database_cleaner", "~> 1.6.2"
2425
gem "codeclimate-test-reporter", require: nil

gemfiles/mongoid_6.gemfile

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
source "https://rubygems.org"
44

55
gem "mongoid", "~> 6"
6-
gem "bson_ext", platform: "ruby"
6+
gem "bson_ext", "1.5.1"
77

88
group :test do
99
gem "appraisal"
1010
gem "coveralls", require: false
1111
gem "its"
12+
gem "pry", "< 0.13.0"
1213
gem "byebug"
13-
gem "pry-byebug"
14+
gem "pry-byebug", "< 3.8.0"
1415
gem "test-unit"
1516
gem "database_cleaner", "~> 1.6.2"
1617
gem "codeclimate-test-reporter", require: nil

gemfiles/mongoid_7.gemfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
source "https://rubygems.org"
44

55
gem "mongoid", "~> 7"
6-
gem "bson_ext", platform: "ruby"
6+
gem "bson_ext", "1.5.1"
7+
gem "railties", "5.2.4.1"
78

89
group :test do
910
gem "appraisal"
1011
gem "coveralls", require: false
1112
gem "its"
13+
gem "pry", "< 0.13.0"
1214
gem "byebug"
13-
gem "pry-byebug"
15+
gem "pry-byebug", "< 3.8.0"
1416
gem "test-unit"
1517
gem "database_cleaner", "~> 1.6.2"
1618
gem "codeclimate-test-reporter", require: nil

0 commit comments

Comments
 (0)