From b822f9f6fc5a00ec08dbc698b9845887d1c4dbc2 Mon Sep 17 00:00:00 2001 From: Soutaro Matsumoto Date: Fri, 26 Jan 2024 08:47:29 +0900 Subject: [PATCH] Bundle rbs-3.4.3 (#9702) * Bundle rbs-3.4.3 * Remove rbs from `TEST_BUNDLED_GEMS_ALLOW_FAILURES` list * Add the failing tests to `rbs_skip_tests` --- .github/workflows/macos.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/yjit-ubuntu.yml | 2 +- gems/bundled_gems | 2 +- tool/rbs_skip_tests | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 82aac2fdf5..1f93580c4e 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -85,7 +85,7 @@ jobs: env: RUBY_TESTOPTS: '-q --tty=no' TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }} - TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'rbs,typeprof' + TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof' PRECHECK_BUNDLED_GEMS: 'no' - name: make skipped tests diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 3a8c563cf4..b78570e224 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -99,7 +99,7 @@ jobs: env: RUBY_TESTOPTS: '-q --tty=no' TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }} - TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'rbs,typeprof' + TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof' PRECHECK_BUNDLED_GEMS: 'no' - name: make skipped tests diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml index 82ca02890e..7998e6b2e9 100644 --- a/.github/workflows/yjit-ubuntu.yml +++ b/.github/workflows/yjit-ubuntu.yml @@ -169,7 +169,7 @@ jobs: timeout-minutes: 60 env: RUBY_TESTOPTS: '-q --tty=no' - TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'rbs,typeprof' + TEST_BUNDLED_GEMS_ALLOW_FAILURES: 'typeprof' PRECHECK_BUNDLED_GEMS: 'no' SYNTAX_SUGGEST_TIMEOUT: '5' YJIT_BINDGEN_DIFF_OPTS: '--exit-code' diff --git a/gems/bundled_gems b/gems/bundled_gems index 02d583ebf6..fcdc6c20ee 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -17,7 +17,7 @@ net-pop 0.1.2 https://github.com/ruby/net-pop net-smtp 0.4.0.1 https://github.com/ruby/net-smtp matrix 0.4.2 https://github.com/ruby/matrix prime 0.1.2 https://github.com/ruby/prime -rbs 3.4.2 https://github.com/ruby/rbs +rbs 3.4.3 https://github.com/ruby/rbs typeprof 0.21.9 https://github.com/ruby/typeprof debug 1.9.1 https://github.com/ruby/debug 91fe870eeceb9ffbbc7f1bb4673f9e2f6a2c1f60 racc 1.7.3 https://github.com/ruby/racc diff --git a/tool/rbs_skip_tests b/tool/rbs_skip_tests index c860ac3b45..56a864d193 100644 --- a/tool/rbs_skip_tests +++ b/tool/rbs_skip_tests @@ -22,6 +22,8 @@ test_collection_install_frozen(RBS::CliTest) running tests without Bundler test_collection_install_gemspec(RBS::CliTest) running tests without Bundler test_collection_update(RBS::CliTest) running tests without Bundler +test_loading_from_rbs_collection__gem_version_mismatch(RBS::EnvironmentLoaderTest) running test without rbs-amber testing gem + test_defs(RBS::RbPrototypeTest) Numeric Nodes are added test_defs_return_type(RBS::RbPrototypeTest) Numeric Nodes are added test_defs_return_type_with_block(RBS::RbPrototypeTest) Numeric Nodes are added @@ -46,6 +48,7 @@ test_parameter(RBS::RbiPrototypeTest) Symbol Node is added test_parameter_type_member_variance(RBS::RbiPrototypeTest) Symbol Node is added test_tuple(RBS::RbiPrototypeTest) Symbol Node is added test_untyped_block(RBS::RbiPrototypeTest) Symbol Node is added +test_argument_forwarding(RBS::RbPrototypeTest) `...` args handling is changed test_TOPDIR(RbConfigSingletonTest) `TOPDIR` is `nil` during CI while RBS type is declared as `String`