1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00

Bump RuboCop to work with newer Psych versions (#2783)

* Patch Rubocop's yaml_safe_load to work with newer Psych versions

* Fix rubocop namespace

* Remove rubocop skip condition from workflow steps

* Fix rubygems warnings about required_ruby_version bug

* Fix step name

* Use RuboCop 0.64.0

Last version we can use while still having Ruby 2.2 support, 0.65.0
drops it: 0c0bee1807/CHANGELOG.md (0650-2019-02-19)

Fixes issues with RubyGems and Psych: https://github.com/puma/puma/pull/2779

Co-authored-by: Dalibor Nasevic <dalibor.nasevic@gmail.com>
This commit is contained in:
Patrik Ragnarsson 2021-12-31 14:18:16 +01:00 committed by GitHub
parent 65f0ced587
commit d676c659e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions

View file

@ -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
@ -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

View file

@ -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"]

View file

@ -72,7 +72,7 @@ module Puma
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