From 06726aa58aaff1354aec31fc53686711d4479a86 Mon Sep 17 00:00:00 2001 From: Soutaro Matsumoto Date: Wed, 16 Jul 2025 23:57:54 +0000 Subject: [PATCH 1/4] Merge pull request #2601 from ima1zumi/add-tsort-dep Add explicit dependency on the tsort gem --- Gemfile.lock | 1 + rbs.gemspec | 1 + 2 files changed, 2 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 6fc10f559..ac76831c3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,6 +3,7 @@ PATH specs: rbs (3.10.2) logger + tsort PATH remote: test/assets/test-gem diff --git a/rbs.gemspec b/rbs.gemspec index a95dd6822..74e5ede12 100644 --- a/rbs.gemspec +++ b/rbs.gemspec @@ -46,4 +46,5 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib"] spec.required_ruby_version = ">= 3.1" spec.add_dependency "logger" + spec.add_dependency "tsort" end From f341c586d70fd187c26742f448545d34de45df45 Mon Sep 17 00:00:00 2001 From: Soutaro Matsumoto Date: Fri, 30 Jan 2026 15:39:35 +0900 Subject: [PATCH 2/4] Merge pull request #2833 from ruby/fix-ci Fix erb installation failure --- .github/workflows/c-check.yml | 2 ++ .github/workflows/comments.yml | 2 ++ .github/workflows/ruby.yml | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/.github/workflows/c-check.yml b/.github/workflows/c-check.yml index a88db3d1b..518237973 100644 --- a/.github/workflows/c-check.yml +++ b/.github/workflows/c-check.yml @@ -44,6 +44,8 @@ jobs: run: | ruby -v gem update --system + - name: install erb + run: gem install erb - name: bin/setup run: | bin/setup diff --git a/.github/workflows/comments.yml b/.github/workflows/comments.yml index 79afd837e..b28f5a873 100644 --- a/.github/workflows/comments.yml +++ b/.github/workflows/comments.yml @@ -26,6 +26,8 @@ jobs: run: | ruby -v gem update --system + - name: install erb + run: gem install erb - name: bin/setup run: | bin/setup diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index ef5c66bca..918d64532 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -50,6 +50,8 @@ jobs: run: | ruby -v gem update --system + - name: install erb + run: gem install erb - name: bundle config set with run: | echo "NO_MINITEST=true" >> $GITHUB_ENV @@ -110,6 +112,8 @@ jobs: run: | ruby -v gem update --system + - name: install erb + run: gem install erb - name: clang version run: clang --version - name: bin/setup From a7890afed5bd3443955c5b8ecc4b96bc29055ac7 Mon Sep 17 00:00:00 2001 From: Yuki Kurihara Date: Fri, 9 Jan 2026 15:03:15 +0900 Subject: [PATCH 3/4] Merge pull request #2795 from ksss/add-tsort Add tsort to testing dependencies --- test/rbs/cli_test.rb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/test/rbs/cli_test.rb b/test/rbs/cli_test.rb index ce974bd8b..b979ea1d8 100644 --- a/test/rbs/cli_test.rb +++ b/test/rbs/cli_test.rb @@ -1174,7 +1174,7 @@ def test_collection_install path: #{dir.join('gem_rbs_collection')} YAML - bundle_install('ast', 'abbrev', 'bigdecimal', 'logger') + bundle_install('ast', 'abbrev', 'bigdecimal', 'logger', 'tsort') _stdout, _stderr = run_rbs_collection("install", bundler: true) rbs_collection_lock = dir.join('rbs_collection.lock.yaml') @@ -1240,7 +1240,7 @@ def test_collection_update path: #{dir.join('gem_rbs_collection')} YAML - bundle_install('ast', 'abbrev', 'bigdecimal', 'logger') + bundle_install('ast', 'abbrev', 'bigdecimal', 'logger', 'tsort') run_rbs_collection("update", bundler: true) assert dir.join('rbs_collection.lock.yaml').exist? @@ -1280,7 +1280,7 @@ def test_collection_install_gemspec RUBY (dir/"sig").mkdir - bundle_install(:gemspec, "abbrev", "bigdecimal", "logger") + bundle_install(:gemspec, "abbrev", "bigdecimal", "logger", "tsort") stdout, _ = run_rbs_collection("install", bundler: true) assert_match(/Installing ast:(\d(\.\d)*)/, stdout) @@ -1310,7 +1310,7 @@ def test_collection_install__mutex_m__config__bundled - name: mutex_m YAML - bundle_install("logger", ["mutex_m", ">= 0.3.0"]) + bundle_install("logger", "tsort", ["mutex_m", ">= 0.3.0"]) _stdout, stderr = run_rbs_collection("install", bundler: true) refute_match(/`mutex_m` as a stdlib in rbs-gem is deprecated./, stderr) @@ -1343,7 +1343,7 @@ def test_collection_install__mutex_m__config__no_bundled - name: mutex_m YAML - bundle_install("logger", ["mutex_m", "0.2.0"]) + bundle_install("logger", "tsort", ["mutex_m", "0.2.0"]) _stdout, stderr = run_rbs_collection("install", bundler: true) assert_include stderr, '`mutex_m` as a stdlib in rbs-gem is deprecated.' @@ -1379,7 +1379,7 @@ def test_collection_install__mutex_m__config__stdlib_source type: stdlib YAML - bundle_install("logger") + bundle_install("logger", "tsort") _stdout, stderr = run_rbs_collection("install", bundler: true) assert_include stderr, '`mutex_m` as a stdlib in rbs-gem is deprecated.' @@ -1410,7 +1410,7 @@ def test_collection_install__mutex_m__bundled path: #{dir.join('gem_rbs_collection')} YAML - bundle_install("logger", ["mutex_m", ">= 0.3.0"]) + bundle_install("logger", "tsort", ["mutex_m", ">= 0.3.0"]) _stdout, stderr = run_rbs_collection("install", bundler: true) refute_match(/`mutex_m` as a stdlib in rbs-gem is deprecated./, stderr) @@ -1440,7 +1440,7 @@ def test_collection_install__mutex_m__no_bundled path: #{dir.join('gem_rbs_collection')} YAML - bundle_install("logger", ["mutex_m", "0.2.0"]) + bundle_install("logger", "tsort", ["mutex_m", "0.2.0"]) _stdout, stderr = run_rbs_collection("install", bundler: true) assert_include stderr, '`mutex_m` as a stdlib in rbs-gem is deprecated.' @@ -1475,7 +1475,7 @@ def test_collection_install__mutex_m__dependency_no_bundled - name: mutex_m YAML - bundle_install("logger", "true_string") # true_string is a soutaro's gem that doesn't have sig directory + bundle_install("logger", "tsort", "true_string") # true_string is a soutaro's gem that doesn't have sig directory _stdout, stderr = run_rbs_collection("install", bundler: true) @@ -1519,7 +1519,7 @@ def test_collection_install__mutex_m__rbs_dependency_and__gem_dependency - name: mutex_m YAML - bundle_install("logger", ["hola", { path: "gem" }]) + bundle_install("logger", "tsort", ["hola", { path: "gem" }]) (dir + RBS::Collection::Config::PATH).write(<<~YAML) sources: @@ -1566,7 +1566,7 @@ def test_collection_install__pathname_set - name: cgi-escape YAML - bundle_install('ast', 'logger') + bundle_install('ast', 'logger', 'tsort') _stdout, stderr = run_rbs_collection("install", bundler: true) assert_include stderr, 'Cannot find `set` gem.' @@ -1605,7 +1605,7 @@ def test_collection_install__set_pathname__manifest - name: cgi-escape YAML - bundle_install("logger", "true_string") # true_string is a soutaro's gem that doesn't have sig directory + bundle_install("logger", "tsort", "true_string") # true_string is a soutaro's gem that doesn't have sig directory _stdout, stderr = run_rbs_collection("install", bundler: true) From 5e5c50a070f6fae7d3a6a5ca557929f3f278425e Mon Sep 17 00:00:00 2001 From: Soutaro Matsumoto Date: Fri, 30 Jan 2026 22:40:16 +0900 Subject: [PATCH 4/4] Delete `ObjectSpace.count_nodes` test --- test/stdlib/ObjectSpace_test.rb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/test/stdlib/ObjectSpace_test.rb b/test/stdlib/ObjectSpace_test.rb index bfbaab3e2..25016e09e 100644 --- a/test/stdlib/ObjectSpace_test.rb +++ b/test/stdlib/ObjectSpace_test.rb @@ -99,17 +99,6 @@ def test_count_imemo_objects ObjectSpace, :count_imemo_objects, { TOTAL: 0 } end - def test_count_nodes - ObjectSpace::trace_object_allocations do - assert_send_type "() -> Hash[Symbol, Integer]", - ObjectSpace, :count_nodes - assert_send_type "(Hash[Symbol, Integer]) -> Hash[Symbol, Integer]", - ObjectSpace, :count_nodes, {} - assert_send_type "(Hash[Symbol, Integer]) -> Hash[Symbol, Integer]", - ObjectSpace, :count_nodes, { TOTAL: 0 } - end - end - def test_count_objects_size assert_send_type "() -> Hash[Symbol, Integer]", ObjectSpace, :count_objects_size