summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-10-23merge revision(s) 280b805d040fa537d5a459b40d4bfa6d49700905: [Backport #18909]nagachika
[DOC] Fix documentation for ARGF#readlines [Bug #18909] --- io.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
2022-10-22merge revision(s) f88bff770578583a708093f4a0d8b1483a1d2039:nagachika
[ruby/net-http] Revert "Replace Timeout.timeout in Net:HTTP#connect" This reverts commit https://github.com/ruby/net-http/commit/753cae3bbccc. https://github.com/ruby/net-http/commit/98caa38204 --- lib/net/http.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
2022-10-22merge revision(s) ac1bb6b51032ad8d34a1060f5f6b5b10b60dc183:nagachika
[ruby/net-http] Rename `D` to `debug` in `Net::HTTP` Renames `D` to `debug` in `Net::HTTP` and introduces an alias for backwards compatibility. This was done for readability reasons, in that `D` did not clearly reflect what the method was doing and can cause some confusion. https://github.com/ruby/net-http/commit/582d6e87d6 --- lib/net/http.rb | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-)
2022-10-21Revert "merge revision(s) b9083c206aa02a824970e809d66607dd2c1a90f1:"nagachika
This reverts commit 97e50a056e795f6551cae2f07a9996f4adf73a1f.
2022-10-21merge revision(s) 7e24ebc649b9b12e5fc704d7fc7563aeaf589e03:nagachika
Disable msystem: MINGW64 job on GitHub Actions (#6545) --- .github/workflows/mingw.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
2022-10-21merge revision(s) 881bc2a1765e7c19ab389c53841adc5ac329f1aa:nagachika
Skip running a DRb test on MinGW It hangs even after a retry https://github.com/ruby/ruby/runs/7966439530?check_suite_focus=true We contacted GitHub Suppport about this before, and we concluded that the problem is on our end. Unfortunately we don't have a bandwidth to fix this MinGW problem, so until we get to work on it, this should be just skipped to avoid a sporadic CI timeout. --- test/drb/drbtest.rb | 1 + test/drb/test_drbssl.rb | 4 ++++ test/rinda/test_rinda.rb | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-)
2022-10-21merge revision(s) 232e2f598103c8eda37d08913665b72b6f787e3f:nagachika
Skip TupleSpaceProxyTest on MINGW64 too It wasn't specific to UCRT64 https://github.com/ruby/ruby/runs/7062992464 --- test/rinda/test_rinda.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
2022-10-21merge revision(s) 49d59215506a30c8a11766627f7af0cdfe0de9d4:nagachika
Fix Rinda test teardown for omitted tests New test failures on MINGW appeared after c2e37c8ff7da395f33fae546d9ae9e2408fc9236. 1) Error: Rinda::TupleSpaceProxyTest#test_00_template: NoMethodError: undefined method `stop_service' for nil:NilClass D:/a/ruby/ruby/src/test/rinda/test_rinda.rb:516:in `teardown' 2) Error: Rinda::TupleSpaceProxyTest#test_ruby_talk_264062: NoMethodError: undefined method `stop_service' for nil:NilClass D:/a/ruby/ruby/src/test/rinda/test_rinda.rb:516:in `teardown' Teardown happens even when the test is omitted. See: https://github.com/ruby/ruby/runs/7058984522 --- test/rinda/test_rinda.rb | 4 ++++ 1 file changed, 4 insertions(+)
2022-10-21merge revision(s) c2e37c8ff7da395f33fae546d9ae9e2408fc9236:nagachika
Try skipping TupleSpaceProxyTest on MinGW UCRT64 As you all know, MinGW UCRT64 CI has randomly got stuck despite its "Finished tests" output. Looking at the logs closely, it seems like all of the recent such reproductions end with the following output: ``` Retrying hung up testcases... [ 1/14] Rinda::TupleSpaceProxyTest#test_ruby_talk_264062 = 0.21 s [ 2/14] Rinda::TupleSpaceProxyTest#test_00_template = 0.01 s [ 3/14] Rinda::TupleSpaceProxyTest#test_inp_rdp = 0.00 s [ 4/14] Rinda::TupleSpaceProxyTest#test_core_03_notify = 0.01 s [ 5/14] Rinda::TupleSpaceProxyTest#test_00_renewer = 0.01 s [ 6/14] Rinda::TupleSpaceProxyTest#test_cancel_02 = 0.11 s [ 7/14] Rinda::TupleSpaceProxyTest#test_00_DRbObject = 0.00 s [ 8/14] Rinda::TupleSpaceProxyTest#test_core_02 = 0.11 s [ 9/14] Rinda::TupleSpaceProxyTest#test_core_01 = 0.11 s [10/14] Rinda::TupleSpaceProxyTest#test_remote_array_and_hash = 0.01 s [11/14] Rinda::TupleSpaceProxyTest#test_00_tuple = 0.00 s [12/14] Rinda::TupleSpaceProxyTest#test_take_bug_8215 = 0.41 s [13/14] Rinda::TupleSpaceProxyTest#test_cancel_01 = 0.11 s [14/14] Rinda::TupleSpaceProxyTest#test_symbol_tuple = 0.01 s Finished tests in 719.252845s, 29.4292 tests/s, 3838.7154 assertions/s. 21167 tests, 2761007 assertions, 0 failures, 0 errors, 708 skips ``` https://github.com/ruby/ruby/runs/7057789554 While it seems to be retried successfully, given that it hungs up once and this appears all the time, this test class seems a bit suspicious. To check if it's related, let me try disabling this for now. --- test/rinda/test_rinda.rb | 3 +++ 1 file changed, 3 insertions(+)
2022-10-21merge revision(s) 137e69b48153dfd47851a1548eeefc6c7c843e92:nagachika
Bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/baseruby.yml | 2 +- .github/workflows/bundled_gems.yml | 2 +- .github/workflows/check_dependencies.yml | 2 +- .github/workflows/check_misc.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/compilers.yml | 2 +- .github/workflows/mingw.yml | 2 +- .github/workflows/mjit.yml | 2 +- .github/workflows/spec_guards.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/wasm.yml | 2 +- .github/workflows/windows.yml | 2 +- .github/workflows/yjit-ubuntu.yml | 2 +- .github/workflows/yjit_asm_tests.yml | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-)
2022-10-21merge revision(s) 9deacb31552e01f1688cc95774c8de735d711443:nagachika
Bump actions/cache from 2 to 3 Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3. - [Release notes](https://github.com/actions/cache/releases) - [Commits](https://github.com/actions/cache/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> --- .github/workflows/baseruby.yml | 2 +- .github/workflows/bundled_gems.yml | 2 +- .github/workflows/check_dependencies.yml | 2 +- .github/workflows/check_misc.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/compilers.yml | 2 +- .github/workflows/mingw.yml | 2 +- .github/workflows/mjit.yml | 2 +- .github/workflows/ubuntu.yml | 2 +- .github/workflows/windows.yml | 8 ++++---- .github/workflows/yjit-ubuntu.yml | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-)
2022-10-21merge revision(s) b9083c206aa02a824970e809d66607dd2c1a90f1:nagachika
[MSWin] Cache installed vcpkg packages --- .github/workflows/windows.yml | 7 +++++++ 1 file changed, 7 insertions(+)
2022-10-21merge revision(s) 7ce3a100f2aef897ee1062dcda23b70cd5574866:nagachika
Fold command line items --- .appveyor.yml | 28 +++++++++++++++++++++++++--- .github/workflows/windows.yml | 7 +++++-- 2 files changed, 30 insertions(+), 5 deletions(-)
2022-10-21merge revision(s) c54eac661350be3c5b991eff349080910966add3:nagachika
Show tool versions --- .github/workflows/mingw.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+)
2022-10-21bump patchlevelnagachika
2022-10-21Bump up rbs-2.7.0Hiroshi SHIBATA
2022-10-21merge revision(s) 41516b35418d6108c75d9f2190a846ded6a47108:nagachika
Extract bundled gems by BASERUBY --- common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
2022-10-21merge revision(s) 91c05b34cd9ca9120c4a5e5e9fe772f2f0d1f6a3:nagachika
Bundled gems test needs `prepare-gems` `prepare-gems` downloads and extracts the bundled gems, and these gems are built by `build-exts` now. --- .github/workflows/bundled_gems.yml | 5 +++++ .github/workflows/compilers.yml | 2 -- .github/workflows/macos.yml | 4 ++-- .github/workflows/ubuntu.yml | 4 ++-- .github/workflows/yjit-ubuntu.yml | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-)
2022-10-21merge revision(s) 44a0a66559ee4a03a84c27feca05e9b1b0f59df8:nagachika
Move to tool/lib/bundled_gem.rb --- common.mk | 6 +++--- defs/gmake.mk | 4 ++-- tool/gem-unpack.rb | 53 ----------------------------------------------- tool/lib/bundled_gem.rb | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 60 insertions(+), 58 deletions(-) delete mode 100644 tool/gem-unpack.rb create mode 100644 tool/lib/bundled_gem.rb
2022-10-21merge revision(s) abfd859b139545110e1fcdd8e99575d5e0bfb4e4:nagachika
Remove github and git related files from extracted bundled gems --- common.mk | 3 ++- defs/gmake.mk | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
2022-10-21merge revision(s) de9c612d6342ae2ea5ae1e46b27abecf17c439b5:nagachika
Also the tests should use the configured pkg-config --- test/mkmf/test_pkg_config.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
2022-10-21merge revision(s) 518301883edee12218657c77ba977e2bde1b17d0:nagachika
Fix parallel build on MINGW When the build is running with a base ruby then generating `x64-ucrt-ruby320.rc` could fail due to a missing dependency to `x64-mingw-ucrt-fake.rb`. This commit adds this dependency. A failing build looks like so: ``` generating x64-mingw-ucrt-fake.rb generating x64-ucrt-ruby320.rc ../snapshot-master/win32/resource.rb:in `require': cannot load such file -- ./x64-mingw-ucrt-fake (LoadError) make: *** [GNUmakefile:57: x64-ucrt-ruby320.rc] Error 1 make: *** Waiting for unfinished jobs.... linking miniruby.exe x64-mingw-ucrt-fake.rb updated ``` --- cygwin/GNUmakefile.in | 4 ++-- template/Makefile.in | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
2022-10-21merge revision(s) 6f5305e0d2b4711b186ece8160716c7f9439ea8d:nagachika
Exclude LIBPATHENV wrapper from PREP --- common.mk | 4 ++-- configure.ac | 2 +- template/Makefile.in | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-)
2022-10-21merge revision(s) bc5b9be1ee44817614bc8311e671fc79ca730625:nagachika
Move duplicate dependencies --- common.mk | 2 ++ template/Makefile.in | 5 ----- win32/Makefile.sub | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-)
2022-10-21merge revision(s) cdfb0272131ed8ef078d371556c2cad40b31d2fb:nagachika
Run find in PATH [ci skip] --- template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
2022-10-21merge revision(s) 0114c72df0dd4c6df3766bc32f4cadd939b3b0f4:nagachika
Clean intermediate files for update-deps [ci skip] --- template/Makefile.in | 1 + 1 file changed, 1 insertion(+)
2022-10-21merge revision(s) 97ce030954dab3f219779e235bee53ba408fbaca:nagachika
Load fake.rb at `BTESTRUBY` So that `mkmf` checks work from `make run`, and also remove duplicate `$(MINIRUBYOPT)` which is used in `$(MINIRUBY)`. --- common.mk | 8 ++++---- template/Makefile.in | 3 +-- template/fake.rb.in | 2 ++ win32/Makefile.sub | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-)
2022-10-21merge revision(s) 9de11fe796e8caca2d87650278028eb95c1e09a0:nagachika
Quiet if the target is already linked the same source --- ext/extmk.rb | 2 +- tool/ln_sr.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)
2022-10-21merge revision(s) 59eadf3d25b0f53e7570f98f1801737af642f328:nagachika
Ignore EACCES on Windows --- tool/ln_sr.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
2022-10-21merge revision(s) e5e6b87e265b95620821f7abac56b5ab90d4c1fd:nagachika
Create temporary file exclusively and clean --- ext/extmk.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
2022-10-21merge revision(s) 6af7212004c0b98f09350b53a032f94f3a1e666c:nagachika
Make extensions under `Gem.extension_api_version` directory --- ext/extmk.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
2022-10-21merge revision(s) 6c1d7dab52b9bd26cbb624634b4acb86ba37aa7f:nagachika
Fix conversion from absolute path to relative path --- tool/ln_sr.rb | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
2022-10-21merge revision(s) c093e7d64545640c8f2e7bb3eb24e3f9e24fb1c5:nagachika
Avoid to symlink under symlink --- ext/extmk.rb | 2 +- tool/ln_sr.rb | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-)
2022-10-21merge revision(s) 78d2be69b500e4552e0e75fdefd26606a0506009:nagachika
Move copying/linking extra files to Makefile so removed by `clean` --- ext/extmk.rb | 81 ++++++++++++++++++++++++----------------- tool/ln_sr.rb | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+), 33 deletions(-) create mode 100755 tool/ln_sr.rb
2022-10-21merge revision(s) ed8c21bbd5071b52d0d0612eadbdad8fe192e974:nagachika
Ensure symlinks to bundled gem with exts have parent dir When configuring with `--disable-rpath` and `--static-linked-ext` (e.g. building for WASI), `extmk.rb` doesn't build exts under bundled gems, and `.bundle/gems/#{gemname}-#{ver}` are not created due to no call of `extmake`. b2491783986084770f6f97552f27b868622730cf starts creating symlink at `.bundle/gems/#{gemname}-#{ver}/lib`, but the parent dir is not created, so configuration aginst debug and rbs gems were failed. --- ext/extmk.rb | 1 + 1 file changed, 1 insertion(+)
2022-10-21merge revision(s) dcbb94d5b9b4a7d0bfde5ba9a5da1ada643a31b7:nagachika
Move timestamps directory for bundled gems --- ext/extmk.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
2022-10-21merge revision(s) b291c972fa36e05107d13eea25cc445db4b4bec3:nagachika
Use built bundled gems in test-bundled-gems --- tool/test-bundled-gems.rb | 49 ++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 24 deletions(-)
2022-10-21merge revision(s) e0a7e5e13141a06103673b9d4ff21ca864ec38f9:nagachika
Kill bundled gem tests when interrupted --- common.mk | 2 +- tool/test-bundled-gems.rb | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-)
2022-10-21merge revision(s) 7f1ca666424849134990d022266bcd4d6636465f:nagachika
Fallback PKG_CONFIG to the configured pkg-config always --- lib/mkmf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
2022-10-21merge revision(s) 019cbded90ade76fdb87d02bd4d444724429fc92:nagachika
mkmf: Add a configure option to set verbose mode (V=1 or 0) in mkmf.rb. Note this change is only for `configure.ac`, not for Windows using `win32/configure.bat`. ``` $ ./configure --help | grep mkmf --enable-mkmf-verbose enable verbose in mkmf ``` Run the following command to enable the mkmf verbose mode. ``` $ ./configure --enable-mkmf-verbose $ grep MKMF_VERBOSE config.status S["MKMF_VERBOSE"]="1" ``` In this mkmf verbose mode, when compiling a native extension, the `rake compile` prints the compiling commands such as "gcc -I. <...> path/to/file" instead of "compiling path/to/file". ``` $ git clone https://github.com/deivid-rodriguez/byebug.git $ cd byebug $ bundle install --standalone $ bundle exec rake compile ... gcc -I. <...> path/to/file ... ``` --- configure.ac | 7 +++++++ lib/mkmf.rb | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-)
2022-10-21merge revision(s) bdb7345ce96c641796909abc2dbdac0d4400ca41:nagachika
Use compiled instead of complied Capitalize creates --- lib/mkmf.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
2022-10-21merge revision(s) 6946263a2994257c6240e52a365700dc573c7ed4:nagachika
[DOC] make internally used classes/methods nodoc Empty class documents are generated even with `:stopdoc:`. --- lib/mkmf.rb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
2022-10-21merge revision(s) 7672f6a42390a1a421fb0633e6810a92df7dad7a:nagachika
mkmf: unify duplicate code in pkg_config --- lib/mkmf.rb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
2022-10-21merge revision(s) ab3cb29bd9bff9c16cfb9d19cc02026998282c12:nagachika
Avoid defining the same test class in multiple files Should fix issues with parallel testing sometimes not running all tests. This should be viewed skipping whitespace changes. Fixes [Bug #18731] --- test/-ext-/bignum/test_big2str.rb | 38 +- test/-ext-/bignum/test_bigzero.rb | 20 +- test/-ext-/bignum/test_div.rb | 38 +- test/-ext-/bignum/test_mul.rb | 260 ++++++------ test/-ext-/bignum/test_pack.rb | 653 +++++++++++++++---------------- test/-ext-/bignum/test_str2big.rb | 52 ++- test/-ext-/funcall/test_funcall.rb | 11 - test/-ext-/funcall/test_passing_block.rb | 5 + test/date/test_date_ractor.rb | 2 +- test/fileutils/clobber.rb | 5 +- test/fileutils/test_dryrun.rb | 2 +- test/fileutils/test_nowrite.rb | 2 +- test/fileutils/test_verbose.rb | 2 +- test/fileutils/visibility_tests.rb | 5 +- test/mkmf/base.rb | 225 ++++++----- test/mkmf/test_config.rb | 16 +- test/mkmf/test_constant.rb | 56 ++- test/mkmf/test_convertible.rb | 48 ++- test/mkmf/test_egrep_cpp.rb | 14 +- test/mkmf/test_find_executable.rb | 82 ++-- test/mkmf/test_flags.rb | 92 +++-- test/mkmf/test_framework.rb | 70 ++-- test/mkmf/test_have_func.rb | 18 +- test/mkmf/test_have_library.rb | 84 ++-- test/mkmf/test_have_macro.rb | 46 ++- test/mkmf/test_install.rb | 38 +- test/mkmf/test_libs.rb | 156 ++++---- test/mkmf/test_mkmf.rb | 14 +- test/mkmf/test_pkg_config.rb | 98 +++-- test/mkmf/test_signedness.rb | 38 +- test/mkmf/test_sizeof.rb | 74 ++-- test/optparse/test_acceptable.rb | 2 +- test/optparse/test_autoconf.rb | 4 +- test/optparse/test_bash_completion.rb | 4 +- test/optparse/test_cclass.rb | 2 +- test/optparse/test_did_you_mean.rb | 2 +- test/optparse/test_getopts.rb | 4 +- test/optparse/test_kwargs.rb | 4 +- test/optparse/test_noarg.rb | 6 +- test/optparse/test_optarg.rb | 2 +- test/optparse/test_placearg.rb | 2 +- test/optparse/test_reqarg.rb | 10 +- test/optparse/test_summary.rb | 2 +- test/optparse/test_zsh_completion.rb | 4 +- test/ruby/enc/test_emoji_breaks.rb | 207 +++++----- test/ruby/enc/test_grapheme_breaks.rb | 115 +++--- test/ruby/test_inlinecache.rb | 2 +- 47 files changed, 1280 insertions(+), 1356 deletions(-) delete mode 100644 test/-ext-/funcall/test_funcall.rb
2022-10-21merge revision(s) acbc2bdd3030bef997919ce56c5b120cc5e91e8f:nagachika
Update the test for [Feature #18615] --- test/mkmf/test_flags.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
2022-10-21merge revision(s) 329c89bb42bb44467588afc1d41d9f99172dfeb5:nagachika
Make implicit function declaration error [Feature #18615] Enable `-Werror=implicit-function-declaration` by default for building C extensions for early failures. --- lib/mkmf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
2022-10-21merge revision(s) b90e56e6243f4e6567991bfd2375e1f58b1414a0:nagachika
mkmf: pkg_config accepts multiple options --- lib/mkmf.rb | 48 +++++++++++++++++++++++--------------------- test/mkmf/test_pkg_config.rb | 7 +++++++ 2 files changed, 32 insertions(+), 23 deletions(-)
2022-10-21merge revision(s) 24c7e75ded461446e7c8e83bbceecccf7bcb4d0e:nagachika
test: backfill coverage for MakeMakefile.pkg_config --- test/mkmf/test_pkg_config.rb | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 test/mkmf/test_pkg_config.rb
2022-10-21merge revision(s) 2304cfa4c08a347f4df4915f88fb062cb12e4eeb:nagachika
Document MakeMakefile#append_cflags This method is at least 7 years old and is widely used in the wild. Since we need to support it, let's document it to make it discoverable. Add docs and move it out of the `# :stopdoc:` zone. --- lib/mkmf.rb | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
2022-10-20merge revision(s) 2d57447ae80e0b0895d6d22d606391b48516ba93:nagachika
Fix missing replacement in 1f91dcdab3b --- template/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)