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.

Sign up for GitHub

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

Jump to bottom

Cherry pick logger fix for Ruby 3.3 #9510

Merged
merged 4 commits into from
Dec 27, 2023
Merged

Cherry pick logger fix for Ruby 3.3 #9510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
595cc23
Add support for upcoming logger 1.4.3 (#9392)
kou Aug 12, 2023
abd2cd9
Keep activesupport at version 7.0.x (#9469)
mattr- Oct 22, 2023
935a7a9
Lock Ruby in CI to v3.1.2 and bump JRuby to v9.4.0.0 (#9196)
ashmaroli Nov 27, 2022
b523390
Stop testing with Rubies older than 2.7 on Windows
ashmaroli Dec 18, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
ruby_version: "3.0"
- label: Ruby 3.1.2
ruby_version: "3.1.2"
- label: JRuby 9.3.4.0
ruby_version: "jruby-9.3.4.0"
- label: JRuby 9.4.0.0
ruby_version: "jruby-9.4.0.0"
steps:
- name: Checkout Repository
uses: actions/checkout@v3
Expand Down
1 change: 1 addition & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ end
#

group :test do
gem "activesupport", "~> 7.0.0"
gem "cucumber", RUBY_VERSION >= "2.5" ? "~> 5.1.2" : "~> 4.1"
gem "httpclient"
gem "jekyll_test_plugin"
Expand Down
16 changes: 9 additions & 7 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
version: "{build}"

image: Visual Studio 2019

clone_depth: 5

branches:
Expand All @@ -13,22 +15,22 @@ build: off
environment:
BUNDLE_WITHOUT: "benchmark:development"
matrix:
- RUBY_FOLDER_VER: "26"
- RUBY_FOLDER_VER: "27"
TZINFO_VERSION: "~> 1.2"
TEST_SUITE: "test"
- RUBY_FOLDER_VER: "26"
- RUBY_FOLDER_VER: "27"
TZINFO_VERSION: "~> 2.0"
TEST_SUITE: "test"
- RUBY_FOLDER_VER: "26"
- RUBY_FOLDER_VER: "27"
TEST_SUITE: "default-site"
- RUBY_FOLDER_VER: "26"
- RUBY_FOLDER_VER: "27"
TEST_SUITE: "profile-docs"
- RUBY_FOLDER_VER: "26"
- RUBY_FOLDER_VER: "27"
TEST_SUITE: "memprof"
- RUBY_FOLDER_VER: "26"
- RUBY_FOLDER_VER: "27"
TZINFO_VERSION: "~> 1.2"
TEST_SUITE: "cucumber"
- RUBY_FOLDER_VER: "26"
- RUBY_FOLDER_VER: "27"
TZINFO_VERSION: "~> 2.0"
TEST_SUITE: "cucumber"

Expand Down
7 changes: 2 additions & 5 deletions lib/jekyll/stevenson.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
module Jekyll
class Stevenson < ::Logger
def initialize
@progname = nil
@level = DEBUG
@default_formatter = Formatter.new
@logdev = $stdout
@formatter = proc do |_, _, _, msg|
formatter = proc do |_, _, _, msg|
msg.to_s
end
super($stdout, :formatter => formatter)
end

def add(severity, message = nil, progname = nil)
Expand Down