Merge pull request #2718 from ruby/ruby-4

Run CI with "4.0.0-preview2"

Author: soutaro

.github/workflows/c-check.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.4"
+          ruby-version: "4.0.0-preview2"
           bundler-cache: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)

.github/workflows/ruby.yml

@@ -13,24 +13,24 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.1', '3.2', '3.3', '3.4', head]
+        ruby: ['3.2', '3.3', '3.4', '4.0.0-preview2', head]
         rubyopt: [""]
         job:
           - test
         include:
           - ruby: head
             job: stdlib_test rubocop
-          - ruby: "3.4"
+          - ruby: "4.0.0-preview2"
             job: stdlib_test
-          - ruby: "3.4"
+          - ruby: "4.0.0-preview2"
             job: test
             rubyopt: "--enable-frozen-string-literal"
-          - ruby: "3.4"
+          - ruby: "4.0.0-preview2"
             job: stdlib_test
             rubyopt: "--enable-frozen-string-literal"
-          - ruby: "3.4"
+          - ruby: "4.0.0-preview2"
             job: rubocop validate test_doc build test_generate_stdlib raap
-          - ruby: "3.4"
+          - ruby: "4.0.0-preview2"
             job: typecheck_test
     env:
       RANDOMIZE_STDLIB_TEST_ORDER: "true"
@@ -94,7 +94,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.4', head]
+        ruby: ['4.0.0-preview2', head]
     steps:
       - uses: actions/checkout@v4
       - name: Install dependencies

.github/workflows/typecheck.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)

.github/workflows/windows.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ['3.2', '3.3', ucrt, mswin]
+        ruby: ['3.4', ucrt, mswin]
     steps:
       - uses: actions/checkout@v4
       - name: load ruby

Gemfile

@@ -11,16 +11,17 @@ gem "rspec"
 gem "rubocop"
 gem "rubocop-rubycw"
 gem "rubocop-on-rbs"
-gem "json", "~> 2.10.2"
+gem "json"
 gem "json-schema"
 gem "goodcheck"
 gem 'digest'
 gem 'tempfile'
-gem "rdoc", "~> 6.16"
+gem "rdoc", "~> 6.16.0"
 gem "fileutils"
 gem "raap"
 gem "activesupport", "~> 7.0"
 gem "extconf_compile_commands_json"
+gem "irb"
 
 group :libs do
   # Libraries required for stdlib test
@@ -30,7 +31,6 @@ group :libs do
   gem "dbm"
   gem "mutex_m"
   gem "nkf"
-  gem "pathname"
 end
 
 group :profilers do

Gemfile.lock

@@ -39,18 +39,24 @@ GEM
     diff-lcs (1.6.1)
     digest (3.2.0)
     drb (2.2.1)
+    erb (6.0.0)
     extconf_compile_commands_json (0.0.7)
     ffi (1.17.2)
-    fileutils (1.7.3)
+    fileutils (1.8.0)
     goodcheck (3.1.0)
       marcel (>= 1.0, < 2.0)
       psych (>= 3.1, < 5.0)
       rainbow (>= 3.0, < 4.0)
       strong_json (>= 1.1, < 2.2)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.10.2)
-    json-schema (5.1.1)
+    io-console (0.8.1)
+    irb (1.15.3)
+      pp (>= 0.6.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.16.0)
+    json-schema (6.0.0)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
     language_server-protocol (3.17.0.4)
@@ -61,25 +67,27 @@ GEM
     logger (1.7.0)
     marcel (1.0.4)
     memory_profiler (1.1.0)
-    mini_portile2 (2.8.8)
-    minitest (5.25.5)
+    mini_portile2 (2.8.9)
+    minitest (5.26.2)
     mutex_m (0.3.0)
     net-protocol (0.2.2)
       timeout
     net-smtp (0.5.1)
       net-protocol
     nkf (0.2.0)
-    nokogiri (1.18.8)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    ostruct (0.6.1)
+    ostruct (0.6.3)
     parallel (1.27.0)
     parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
-    pathname (0.4.0)
-    power_assert (2.0.5)
-    prism (1.4.0)
+    power_assert (3.0.1)
+    pp (0.6.3)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.6.0)
     pstore (0.2.0)
     psych (4.0.6)
       stringio
@@ -95,11 +103,14 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.16.0)
+    rdoc (6.16.1)
       erb
       psych (>= 4.0.0)
-    regexp_parser (2.10.0)
-    rspec (3.13.0)
+      tsort
+    regexp_parser (2.11.3)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rspec (3.13.2)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
@@ -165,6 +176,7 @@ GEM
     test-unit (3.6.8)
       power_assert
     timeout (0.4.3)
+    tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.1.4)
@@ -188,22 +200,22 @@ DEPENDENCIES
   extconf_compile_commands_json
   fileutils
   goodcheck
-  json (~> 2.10.2)
+  irb
+  json
   json-schema
   memory_profiler
   minitest
   mutex_m
   net-smtp
   nkf
   ostruct
-  pathname
   pstore
   raap
   rake
   rake-compiler
   rbs!
   rbs-amber!
-  rdoc (~> 6.16)
+  rdoc (~> 6.16.0)
   rspec
   rubocop
   rubocop-on-rbs
@@ -215,4 +227,4 @@ DEPENDENCIES
   test-unit
 
 BUNDLED WITH
-   2.6.3
+  4.0.0.dev

Rakefile

@@ -212,7 +212,14 @@ task :validate => :compile do
   end
 
   libs.each do |lib|
-    sh "#{ruby} #{rbs} -r #{lib} validate --exit-error-on-syntax-error"
+    args = ["-r", lib]
+
+    if lib == "rbs"
+      args << "-r"
+      args << "prism"
+    end
+
+    sh "#{ruby} #{rbs} #{args.join(' ')} validate --exit-error-on-syntax-error"
   end
 end
 

bin/benchmark-parse.rb

@@ -1,7 +1,6 @@
 require "rbs"
 require "benchmark/ips"
 require "csv"
-require "pathname"
 
 files = {}
 ARGV.each do |file|

lib/rbs.rb

@@ -4,7 +4,7 @@
 
 require "set"
 require "json"
-require "pathname"
+require "pathname" unless defined?(Pathname)
 require "pp"
 require "ripper"
 require "logger"

steep/Gemfile.lock

@@ -80,4 +80,4 @@ DEPENDENCIES
   steep (~> 1.10.pre)
 
 BUNDLED WITH
-   2.6.3
+   4.0.0.dev