Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump RuboCop to work with newer Psych versions #2783

Merged
merged 6 commits into from Dec 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/mri.yml
Expand Up @@ -59,6 +59,13 @@ jobs:
continue-on-error: true
timeout-minutes: 5

# Fix RubyGems warnings about required_ruby_version bug with Bundler
- name: update rubygems for Ruby 2.3 - 2.5
if: matrix.ruby >= '2.3' && matrix.ruby < '2.6'
run: gem update --system 3.2.3 --no-document
continue-on-error: true
timeout-minutes: 5

- name: Compile Puma without SSL support
if: matrix.no-ssl == ' no SSL'
shell: bash
Expand All @@ -72,8 +79,6 @@ jobs:
run: bundle exec rake compile

- name: rubocop
# 2021-05-20 - RuboCop won't run with Psych 4.0 - remove when fixed
if: (endsWith(matrix.ruby, 'head') == false) && (endsWith(matrix.ruby, 'ucrt') == false)
run: bundle exec rake rubocop

- name: Use yjit
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -16,7 +16,7 @@ gem "sd_notify"

gem "jruby-openssl", :platform => "jruby"

gem "rubocop", "~> 0.58.0"
gem "rubocop", "~> 0.64.0"

if %w(2.2.7 2.2.8 2.2.9 2.2.10 2.3.4 2.4.1).include? RUBY_VERSION
gem "stopgap_13632", "~> 1.0", :platforms => ["mri", "mingw", "x64_mingw"]
Expand Down
2 changes: 1 addition & 1 deletion lib/puma/thread_pool.rb
Expand Up @@ -72,7 +72,7 @@ def initialize(name, min, max, *extra, &block)
attr_accessor :out_of_band_hook # @version 5.0.0

def self.clean_thread_locals
Thread.current.keys.each do |key| # rubocop: disable Performance/HashEachMethods
Thread.current.keys.each do |key| # rubocop: disable Style/HashEachMethods
Thread.current[key] = nil unless key == :__recursive_key__
end
end
Expand Down