Skip to content

Commit

Permalink
Merge pull request #3946 from rubygems/fix_ci
Browse files Browse the repository at this point in the history
Fix CI

(cherry picked from commit 4a33b04)
  • Loading branch information
deivid-rodriguez committed Oct 6, 2020
1 parent 4a96a1e commit 44230f6
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions bundler/spec/commands/newgem_spec.rb
Expand Up @@ -12,11 +12,12 @@ def gem_skeleton_assertions

def bundle_exec_rubocop
prepare_gemspec(bundled_app(gem_name, "#{gem_name}.gemspec"))
rubocop_version = RUBY_VERSION > "2.4" ? "0.85.1" : "0.80.1"
rubocop_version = RUBY_VERSION > "2.4" ? "0.90.0" : "0.80.1"
gems = ["minitest", "rake", "rake-compiler", "rspec", "rubocop -v #{rubocop_version}", "test-unit"]
gems += ["rubocop-ast -v 0.4.0"] if rubocop_version == "0.90.0"
path = Bundler.feature_flag.default_install_uses_path? ? local_gem_path(:base => bundled_app(gem_name)) : system_gem_path
realworld_system_gems gems, :path => path
bundle "exec rubocop --config .rubocop.yml", :dir => bundled_app(gem_name)
bundle "exec rubocop --debug --config .rubocop.yml", :dir => bundled_app(gem_name)
end

let(:generated_gemspec) { Bundler.load_gemspec_uncached(bundled_app(gem_name).join("#{gem_name}.gemspec")) }
Expand Down

0 comments on commit 44230f6

Please sign in to comment.