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
6 changes: 3 additions & 3 deletions .github/workflows/ci-build-and-install-gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ on:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v6

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.2
ruby-version: ruby

- name: Build and install gem
run: gem build *.gemspec && gem install *.gem
8 changes: 5 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest

strategy:
fail-fast: false
Expand All @@ -17,13 +17,15 @@ jobs:
- { ruby: '3.0' }
- { ruby: '3.1' }
- { ruby: '3.2' }
- { ruby: '3.3' }
- { ruby: '3.4' }
- { ruby: head, allow-failure: true }
- { ruby: jruby-9.3 }
- { ruby: jruby-10.0 }
- { ruby: jruby-head, allow-failure: true }

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v6

- name: Setup Ruby ${{ matrix.ruby }}
uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/twingly/public_suffix_list_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
let(:encoding) { Encoding::US_ASCII }
# https://github.com/ruby/ruby/commit/571d21fd4a2e877f49b4ff918832bda9a5e8f91c
let(:expected_error) do
if RUBY_VERSION >= "3.2.0"
if RUBY_VERSION >= "3.2.0" && RUBY_ENGINE != "jruby"
Encoding::CompatibilityError
else
ArgumentError
Expand Down
4 changes: 2 additions & 2 deletions spec/lib/twingly/url_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def leading_and_trailing_whitespace
context "when called from the outside" do
it "raises an error" do
expect { described_class.internal_parse("a") }.
to raise_error(NoMethodError, /private method `internal_parse' called for/)
to raise_error(NoMethodError, /private method (`|')internal_parse' called for/)
end
end
end
Expand All @@ -229,7 +229,7 @@ def leading_and_trailing_whitespace
context "when called from the outside" do
it "raises an error" do
expect { described_class.new("a", "b") }.
to raise_error(NoMethodError, /private method `new' called for/)
to raise_error(NoMethodError, /private method (`|')new' called for/)
end
end
end
Expand Down
4 changes: 2 additions & 2 deletions twingly-url.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ Gem::Specification.new do |s|
s.required_ruby_version = ">= 2.6"

s.add_dependency "addressable", "~> 2.6"
s.add_dependency "public_suffix", ">= 3.0.1", "< 6.0"
s.add_dependency "public_suffix", ">= 3.0.1", "< 8"

s.add_development_dependency "rake", "~> 12"
s.add_development_dependency "rake"
s.add_development_dependency "rspec", "~> 3"
s.add_development_dependency "pry", "~> 0"

Expand Down