Skip to content

Commit

Permalink
Merge pull request #234 from kg8m/ruby33
Browse files Browse the repository at this point in the history
Support Ruby 3.3
  • Loading branch information
kg8m authored Dec 27, 2023
2 parents ebedf05 + 270437a commit 69948da
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 21 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ jobs:
ruby-version:
- "3.1"
- "3.2"
- "3.3"
rails-version:
- "~> 7.0.0"
- "~> 7.1.0"
Expand Down Expand Up @@ -61,7 +62,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2"
ruby-version: "3.3"
bundler-cache: true

- name: RuboCop
Expand All @@ -79,7 +80,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2"
ruby-version: "3.3"
bundler-cache: true

- name: Run typecheck
Expand All @@ -99,7 +100,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2"
ruby-version: "3.3"
bundler-cache: true

- name: Check YARD docs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-autolabeling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2"
ruby-version: "3.3"
bundler-cache: true

- name: Fetch Dependabot metadata
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-rbs-collection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2"
ruby-version: "3.3"
bundler-cache: true

- name: Generate token
Expand Down
9 changes: 0 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,6 @@ GEM
nokogiri (1.15.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.5-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.5-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.5-x86_64-linux)
racc (~> 1.4)
paint (2.3.0)
parallel (1.24.0)
parser (3.2.2.4)
Expand Down Expand Up @@ -279,9 +273,6 @@ GEM
sprockets (>= 3.0.0)
sqlite3 (1.6.9)
mini_portile2 (~> 2.8.0)
sqlite3 (1.6.9-arm64-darwin)
sqlite3 (1.6.9-x86_64-darwin)
sqlite3 (1.6.9-x86_64-linux)
steep (1.6.0)
activesupport (>= 5.1)
concurrent-ruby (>= 1.1.10)
Expand Down
2 changes: 1 addition & 1 deletion sig/patch/english.rbs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# https://ruby-doc.org/3.2.2/stdlibs/English/English.html
# https://ruby-doc.org/3.3.0/stdlibs/English/English.html
# https://docs.ruby-lang.org/ja/latest/method/Kernel/v/CHILD_STATUS.html
$CHILD_STATUS: Process::Status | nil
2 changes: 1 addition & 1 deletion sig/patch/pty.rbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# https://ruby-doc.org/3.2.2/exts/pty/PTY.html
# https://ruby-doc.org/3.3.0/exts/pty/PTY.html
module PTY
def self.spawn: (String command) { (IO r, IO w, Integer pid) -> void } -> void
end
7 changes: 2 additions & 5 deletions spec/models/tanshuku/url_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1128,10 +1128,7 @@

context "and url_options isn’t given" do
it "raises NoMethodError due to `nil.merge`" do
expect { tanshuku_url.shortened_url }.to raise_error(
NoMethodError,
"undefined method `merge' for nil:NilClass"
)
expect { tanshuku_url.shortened_url }.to raise_error(NoMethodError, /\bundefined method `merge' for nil\b/)
end
end

Expand All @@ -1141,7 +1138,7 @@
it "raises NoMethodError due to `nil.merge`" do
expect { tanshuku_url.shortened_url(url_options) }.to raise_error(
NoMethodError,
"undefined method `merge' for nil:NilClass"
/\bundefined method `merge' for nil\b/
)
end
end
Expand Down

0 comments on commit 69948da

Please sign in to comment.