Skip to content

Commit

Permalink
CI build fix: Pin to pry < 0.13 for 2.3 support, workaround CodeClima…
Browse files Browse the repository at this point in the history
…te reporter issue (lynndylanhurley#1393)

* gemfiles: Pin to < 0.13 for 2.3 support

* Workaround: CodeClimate not supporting SimpleCov

  - 0.18 gives us issues
  - see codeclimate/test-reporter#418
  • Loading branch information
olleolleolle committed Mar 30, 2020
1 parent 49e7203 commit 8c6ea5a
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -65,11 +65,11 @@ matrix:
- bundle install --jobs=3 --retry=3 --gemfile $GEMFILE_AR
- BUNDLE_GEMFILE=$GEMFILE_AR bundle exec rake --trace db:migrate
- BUNDLE_GEMFILE=$GEMFILE_AR bundle exec rake
- ./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.active_record.json coverage/.resultset.json
- ./cc-test-reporter format-coverage coverage/.resultset.json -t simplecov -o coverage/codeclimate.active_record.json
# with Mongoid
- bundle install --jobs=3 --retry=3 --gemfile $GEMFILE_MONGOID
- BUNDLE_GEMFILE=$GEMFILE_MONGOID DEVISE_TOKEN_AUTH_ORM=mongoid bundle exec rake
- ./cc-test-reporter format-coverage -t simplecov -o coverage/codeclimate.mongoid.json coverage/.resultset.json
- ./cc-test-reporter format-coverage coverage/.resultset.json -t simplecov -o coverage/codeclimate.mongoid.json
# merge test results
- if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then
./cc-test-reporter sum-coverage coverage/codeclimate.active_record.json coverage/codeclimate.mongoid.json;
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_4_2.gemfile
Expand Up @@ -27,7 +27,7 @@ group :development, :test do
gem "minitest-rails"
gem "minitest-reporters"
gem "mocha", ">= 1.5"
gem "pry"
gem "pry", "< 0.13"
gem "pry-byebug"
gem "pry-remote"
gem "rubocop", require: false
Expand Down
3 changes: 2 additions & 1 deletion gemfiles/rails_4_2_mongoid_5.gemfile
Expand Up @@ -8,6 +8,7 @@ gem "mongoid-locker", "~> 1.0"

group :development, :test do
gem "attr_encrypted"
gem "byebug", "< 11.1"
gem "figaro", git: "https://github.com/laserlemon/figaro"
gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook"
gem "omniauth-github", git: "https://github.com/intridea/omniauth-github"
Expand All @@ -26,7 +27,7 @@ group :development, :test do
gem "minitest-rails"
gem "minitest-reporters"
gem "mocha", ">= 1.5"
gem "pry"
gem "pry", "< 0.13"
gem "pry-byebug"
gem "pry-remote"
gem "rubocop", require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5_0.gemfile
Expand Up @@ -27,7 +27,7 @@ group :development, :test do
gem "minitest-rails"
gem "minitest-reporters"
gem "mocha", ">= 1.5"
gem "pry"
gem "pry", "< 0.13"
gem "pry-byebug"
gem "pry-remote"
gem "rubocop", require: false
Expand Down
8 changes: 6 additions & 2 deletions gemfiles/rails_5_1.gemfile
Expand Up @@ -27,15 +27,19 @@ group :development, :test do
gem "minitest-rails"
gem "minitest-reporters"
gem "mocha", ">= 1.5"
gem "pry"
gem "pry", "< 0.13"
gem "pry-byebug"
gem "pry-remote"
gem "rubocop", require: false
end

group :test do
gem "rails-controller-testing"
gem "simplecov", require: false

# Workaround for cc-test-reporter with SimpleCov 0.18.
# Stop upgrading SimpleCov until the following issue will be resolved.
# https://github.com/codeclimate/test-reporter/issues/418
gem 'simplecov', '~> 0.10', '< 0.18', require: false
end

group :development do
Expand Down
3 changes: 2 additions & 1 deletion gemfiles/rails_5_1_mongoid_6.gemfile
Expand Up @@ -8,6 +8,7 @@ gem "mongoid-locker", "~> 1.0"

group :development, :test do
gem "attr_encrypted"
gem "byebug", "< 11.1"
gem "figaro", git: "https://github.com/laserlemon/figaro"
gem "omniauth-facebook", git: "https://github.com/mkdynamic/omniauth-facebook"
gem "omniauth-github", git: "https://github.com/intridea/omniauth-github"
Expand All @@ -26,7 +27,7 @@ group :development, :test do
gem "minitest-rails"
gem "minitest-reporters"
gem "mocha", ">= 1.5"
gem "pry"
gem "pry", "< 0.13"
gem "pry-byebug"
gem "pry-remote"
gem "rubocop", require: false
Expand Down
6 changes: 5 additions & 1 deletion gemfiles/rails_5_1_mongoid_7.gemfile
Expand Up @@ -34,7 +34,11 @@ end

group :test do
gem "rails-controller-testing"
gem "simplecov", require: false

# Workaround for cc-test-reporter with SimpleCov 0.18.
# Stop upgrading SimpleCov until the following issue will be resolved.
# https://github.com/codeclimate/test-reporter/issues/418
gem 'simplecov', '~> 0.10', '< 0.18', require: false
end

group :development do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_5_2.gemfile
Expand Up @@ -27,7 +27,7 @@ group :development, :test do
gem "minitest-rails"
gem "minitest-reporters"
gem "mocha", ">= 1.5"
gem "pry"
gem "pry", "< 0.13"
gem "pry-byebug"
gem "pry-remote"
gem "rubocop", require: false
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6_0.gemfile
Expand Up @@ -27,7 +27,7 @@ group :development, :test do
gem "minitest-rails"
gem "minitest-reporters"
gem "mocha", ">= 1.5"
gem "pry"
gem "pry", "< 0.13"
gem "pry-byebug"
gem "pry-remote"
gem "rubocop", require: false
Expand Down

0 comments on commit 8c6ea5a

Please sign in to comment.