Skip to content

Commit

Permalink
Rollback simplecov to fix CC incompatiblity
Browse files Browse the repository at this point in the history
CodeClimate isn't compatible with simplecov 0.18.x:

codeclimate/test-reporter#413

Even 0.17 was causing errors:

https://jenkins.conjur.net/blue/organizations/jenkins/cyberark--conjur/detail/tmp%2Frails-5-clean/17/pipeline

So this rolls back to 0.14, which is what was working on master.
  • Loading branch information
jonahx committed Mar 30, 2020
1 parent 4db3646 commit 4e496c6
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 34 deletions.
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ gem 'rack-rewrite'
# Putting this here currently confuses debify, so instead load it in application.rb
# gem 'conjur_audit', path: 'engines/conjur_audit'

gem 'simplecov', require: false
# This old version is required to work with CC
# See: https://github.com/codeclimate/test-reporter/issues/418
gem 'simplecov', '0.14.1', require: false

gem 'sass-rails'
gem 'mini_racer'
Expand Down
41 changes: 13 additions & 28 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ GEM
autoprefixer-rails (9.7.5)
execjs
aws-eventstream (1.0.3)
aws-partitions (1.288.0)
aws-partitions (1.290.0)
aws-sdk-core (3.92.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
Expand All @@ -87,15 +87,11 @@ GEM
aws-sigv4 (~> 1.1)
aws-sigv4 (1.1.1)
aws-eventstream (~> 1.0, >= 1.0.2)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
backports (3.17.0)
base32-crockford (0.1.0)
base58 (0.2.3)
bcrypt-ruby (3.0.1)
bindata (2.4.6)
bindata (2.4.7)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
Expand All @@ -107,11 +103,7 @@ GEM
ci_reporter_rspec (1.0.0)
ci_reporter (~> 2.0)
rspec (>= 2.14, < 4)
codeclimate-engine-rb (0.4.1)
virtus (~> 1.0)
coderay (1.1.2)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
command_class (0.0.2)
concurrent-ruby (1.1.6)
conjur-cli (6.2.1)
Expand Down Expand Up @@ -158,10 +150,8 @@ GEM
debase-ruby_core_source (>= 0.10.2)
debase-ruby_core_source (0.10.9)
deep_merge (1.2.1)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
diff-lcs (1.3)
docile (1.3.2)
docile (1.1.5)
docker-api (1.34.2)
excon (>= 0.47.0)
multi_json
Expand Down Expand Up @@ -194,7 +184,6 @@ GEM
dry-equalizer (~> 0.2)
dry-logic (~> 0.4, >= 0.4.2)
inflecto (~> 0.0.0, >= 0.0.2)
equalizer (0.0.11)
erubi (1.9.0)
event_emitter (0.2.6)
excon (0.73.0)
Expand All @@ -211,7 +200,7 @@ GEM
activesupport (>= 4.2.0)
haikunator (1.1.0)
highline (1.7.10)
http (4.4.0)
http (4.4.1)
addressable (~> 2.3)
http-cookie (~> 1.0)
http-form_data (~> 2.2)
Expand All @@ -233,6 +222,7 @@ GEM
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jmespath (1.4.0)
json (2.3.0)
json-jwt (1.11.0)
activesupport (>= 4.2)
aes_key_wrap
Expand Down Expand Up @@ -352,8 +342,7 @@ GEM
rb-inotify (0.10.1)
ffi (~> 1.0)
recursive-open-struct (1.1.1)
reek (5.6.0)
codeclimate-engine-rb (~> 0.4.0)
reek (6.0.0)
kwalify (~> 0.7.0)
parser (>= 2.5.0.0, < 2.8, != 2.5.1.1)
psych (~> 3.1.0)
Expand Down Expand Up @@ -422,10 +411,11 @@ GEM
activemodel (>= 4.0.0)
railties (>= 4.0.0)
sequel (>= 3.28, < 6.0)
simplecov (0.18.5)
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov-html (0.12.2)
simplecov (0.14.1)
docile (~> 1.1.0)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
slosilo (2.1.1)
spring (2.1.0)
spring-commands-cucumber (1.0.1)
Expand Down Expand Up @@ -453,19 +443,14 @@ GEM
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
unf_ext (0.0.7.6)
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
validate_email (0.1.6)
activemodel (>= 3.0)
mail (>= 2.2.5)
validate_url (1.0.8)
activemodel (>= 3.0.0)
public_suffix
virtus (1.0.5)
axiom-types (~> 0.1)
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
equalizer (~> 0.0, >= 0.0.9)
webfinger (1.1.0)
activesupport
httpclient (>= 2.4)
Expand Down Expand Up @@ -545,7 +530,7 @@ DEPENDENCIES
sequel-pg_advisory_locking
sequel-postgres-schemata
sequel-rails
simplecov
simplecov (= 0.14.1)
slosilo (~> 2.1)
spring
spring-commands-cucumber
Expand Down
4 changes: 3 additions & 1 deletion ci/coverage-report-generator/Gemfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
source 'https://rubygems.org'
gem 'simplecov', '~> 0.17.1'
# Updating to latest version not compatible with CC
# See: https://github.com/codeclimate/test-reporter/issues/418
gem 'simplecov', '0.17'
8 changes: 4 additions & 4 deletions ci/coverage-report-generator/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ GEM
remote: https://rubygems.org/
specs:
docile (1.3.2)
json (2.2.0)
simplecov (0.17.1)
json (2.3.0)
simplecov (0.17.0)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
Expand All @@ -13,7 +13,7 @@ PLATFORMS
ruby

DEPENDENCIES
simplecov (~> 0.17.1)
simplecov (= 0.17)

BUNDLED WITH
1.17.2
2.1.4

0 comments on commit 4e496c6

Please sign in to comment.