Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu, macos, windows ]
ruby: [ 3.2.9, 3.3.9, 3.4.7 ]
ruby: [ 3.2.9, 3.3.10, 3.4.8, 4.0.0 ]
mspecopt: [""]
rubyopt: [""]
exclude:
- { os: windows, ruby: 3.2.9 } # 3.2.9 has some issue with file time microseconds
include:
- { os: windows, ruby: 3.2.8 } # 3.2.9 has some issue with file time microseconds
- { os: ubuntu, ruby: 3.4.7, mspecopt: "--repeat 2" }
- { os: ubuntu, ruby: 3.4.7, rubyopt: "--enable-frozen-string-literal" }
- { os: ubuntu, ruby: 3.4.7, rubyopt: "--parser=parse.y" }
- { os: ubuntu, ruby: 4.0.0, mspecopt: "--repeat 2" }
- { os: ubuntu, ruby: 4.0.0, rubyopt: "--enable-frozen-string-literal" }
- { os: ubuntu, ruby: 4.0.0, rubyopt: "--parser=parse.y" }

runs-on: ${{ matrix.os }}-latest
steps:
Expand Down Expand Up @@ -78,5 +78,5 @@ jobs:
- uses: actions/checkout@v6
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.4'
ruby-version: '4.0'
- run: bin/rubocop
17 changes: 13 additions & 4 deletions language/magic_comment_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,19 @@

describe "Magic comments" do
describe "in stdin" do
it_behaves_like :magic_comments, :locale, -> file {
print_at_exit = fixture(__FILE__, "print_magic_comment_result_at_exit.rb")
ruby_exe(nil, args: "< #{fixture(__FILE__, file)}", options: "-r#{print_at_exit}")
}
ruby_version_is ""..."4.0" do
it_behaves_like :magic_comments, :locale, -> file {
print_at_exit = fixture(__FILE__, "print_magic_comment_result_at_exit.rb")
ruby_exe(nil, args: "< #{fixture(__FILE__, file)}", options: "-r#{print_at_exit}")
}
end

ruby_version_is "4.0" do
it_behaves_like :magic_comments, :UTF8, -> file {
print_at_exit = fixture(__FILE__, "print_magic_comment_result_at_exit.rb")
ruby_exe(nil, args: "< #{fixture(__FILE__, file)}", options: "-r#{print_at_exit}")
}
end
end

platform_is_not :windows do
Expand Down
2 changes: 1 addition & 1 deletion library/socket/shared/address.rb
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
end
end

guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.0" } do
guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.1" } do
it 'equals address of peer socket' do
if @method == :local_address
@addr.to_s.should == @b.remote_address.to_s
Expand Down
6 changes: 3 additions & 3 deletions library/socket/unixsocket/recvfrom_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
end
end

guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.0" } do
guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.1" } do
it "returns an array containing basic information on the client as second element" do
@client.send("foobar", 0)
sock = @server.accept
Expand All @@ -54,7 +54,7 @@
end
end

guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.0" } do
guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.1" } do
it "returns an array containing server's address as second element" do
@client.send("", 0)
sock = @server.accept
Expand Down Expand Up @@ -131,7 +131,7 @@
end
end

guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.0" } do
guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.1" } do
it 'returns an Array containing the data and address information' do
@server.recvfrom(5).should == ['hello', ['AF_UNIX', '']]
end
Expand Down