From 420b9de0b7ac39fd7a7eb5200a19a6a862448d04 Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Sat, 13 Mar 2021 00:26:07 +0900 Subject: [PATCH 1/2] Revert "Workaround for JRuby 9.2.15.0 regression" This reverts commit a04d1263490f3a0c932a67f85ed0a14d41401897. --- .circleci/config.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d759356855..e460801f474 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -187,10 +187,7 @@ jobs: # JRuby 9.2 jruby-9.2-spec: docker: - # FIXME: Workaround for JRuby 9.2.15.0. - # Please specify `circleci/jruby:9.2` when the following issue will be resolved. - # https://github.com/jruby/jruby/issues/6581 - - image: circleci/jruby:9.2.14 + - image: circleci/jruby:9.2 environment: <<: *common_env <<: *jruby_env @@ -198,10 +195,7 @@ jobs: *spec_steps jruby-9.2-ascii_spec: docker: - # FIXME: Workaround for JRuby 9.2.15.0. - # Please specify `circleci/jruby:9.2` when the following issue will be resolved. - # https://github.com/jruby/jruby/issues/6581 - - image: circleci/jruby:9.2.14 + - image: circleci/jruby:9.2 environment: <<: *common_env <<: *jruby_env @@ -209,10 +203,7 @@ jobs: *ascii_spec_steps jruby-9.2-rubocop: docker: - # FIXME: Workaround for JRuby 9.2.15.0. - # Please specify `circleci/jruby:9.2` when the following issue will be resolved. - # https://github.com/jruby/jruby/issues/6581 - - image: circleci/jruby:9.2.14 + - image: circleci/jruby:9.2 environment: <<: *common_env <<: *jruby_env From 6c08520766af5f5968b613886e9bda9d654d598d Mon Sep 17 00:00:00 2001 From: Koichi ITO Date: Sat, 13 Mar 2021 00:27:50 +0900 Subject: [PATCH 2/2] Revert "Workaround for JRuby 9.2.14.0" This reverts commit 0381d1bb28ef2fc68b759787b6ed1f9b671c83c4. --- spec/rubocop/cli/options_spec.rb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spec/rubocop/cli/options_spec.rb b/spec/rubocop/cli/options_spec.rb index e3d54af1475..ed192285c64 100644 --- a/spec/rubocop/cli/options_spec.rb +++ b/spec/rubocop/cli/options_spec.rb @@ -1183,11 +1183,6 @@ def full_description_of_cop(cop) it 'prints all cops in their right department listing' do lines = stdout.lines - # FIXME: Remove the following workaround condition for JRuby. - # https://github.com/jruby/jruby/issues/6528 - if RUBY_ENGINE == 'jruby' && Encoding.default_external == Encoding::ASCII - lines = lines.select(&:valid_encoding?) - end lines.slice_before(/Department /).each do |slice| departments = registry.departments.map(&:to_s) current =