diff options
author | Soutaro Matsumoto <matsumoto@soutaro.com> | 2023-03-02 12:59:04 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-02 12:59:04 +0900 |
commit | 1abec43b5d3290ef2229ceb64014ed91410a6381 (patch) | |
tree | af546191cf1ef52b4c04248513ff110222a8f0e6 | |
parent | d2d521b274f6fb5630b64365c6f1af0dbbc0719f (diff) | |
download | ruby-1abec43b5d3290ef2229ceb64014ed91410a6381.tar.gz |
Fix rbs (#7415)
* Update RBS to skip validation task
* Revert TEST_BUNDLED_GEMS_ALLOW_FAILURES
-rw-r--r-- | .github/workflows/ubuntu.yml | 2 | ||||
-rw-r--r-- | .github/workflows/yjit-ubuntu.yml | 2 | ||||
-rw-r--r-- | gems/bundled_gems | 2 | ||||
-rw-r--r-- | tool/test-bundled-gems.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 846e04e8be..e530754253 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -107,7 +107,7 @@ jobs: env: RUBY_TESTOPTS: "-q --tty=no" TESTS: ${{ matrix.test_task == 'check' && matrix.skipped_tests || '' }} - TEST_BUNDLED_GEMS_ALLOW_FAILURES: "rbs" + TEST_BUNDLED_GEMS_ALLOW_FAILURES: "" PRECHECK_BUNDLED_GEMS: "no" - name: make skipped tests run: | diff --git a/.github/workflows/yjit-ubuntu.yml b/.github/workflows/yjit-ubuntu.yml index b01c89b318..b3a6b6d41e 100644 --- a/.github/workflows/yjit-ubuntu.yml +++ b/.github/workflows/yjit-ubuntu.yml @@ -143,7 +143,7 @@ jobs: timeout-minutes: 60 env: RUBY_TESTOPTS: "-q --tty=no" - TEST_BUNDLED_GEMS_ALLOW_FAILURES: "rbs" + TEST_BUNDLED_GEMS_ALLOW_FAILURES: "" PRECHECK_BUNDLED_GEMS: "no" continue-on-error: ${{ matrix.test_task == 'yjit-bench' }} - name: Show ${{ github.event.pull_request.base.ref }} GitHub URL for yjit-bench comparison diff --git a/gems/bundled_gems b/gems/bundled_gems index d3d541fd41..ca42406b48 100644 --- a/gems/bundled_gems +++ b/gems/bundled_gems @@ -17,6 +17,6 @@ net-pop 0.1.2 https://github.com/ruby/net-pop net-smtp 0.3.3 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.0.2 https://github.com/ruby/rbs a8c7997eaafa37f2b78f0ee4a87eeaf4d68a0339 +rbs 3.0.2 https://github.com/ruby/rbs 7a5663f0f433ccd24db32e4dda9dc7754c269247 typeprof 0.21.6 https://github.com/ruby/typeprof debug 1.7.1 https://github.com/ruby/debug d7bf3b2e4502eb0f07a67f00e5fce5a0d661189e diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb index 26ad265608..5ec8cc5cc7 100644 --- a/tool/test-bundled-gems.rb +++ b/tool/test-bundled-gems.rb @@ -34,7 +34,7 @@ File.foreach("#{gem_dir}/bundled_gems") do |line| when "typeprof" when "rbs" - test_command << " stdlib_test validate RBS_SKIP_TESTS=#{__dir__}/rbs_skip_tests" + test_command << " stdlib_test validate RBS_SKIP_TESTS=#{__dir__}/rbs_skip_tests SKIP_RBS_VALIDATION=true" first_timeout *= 3 when "debug" |