summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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(-)
2022-10-20merge revision(s) 6a8f1a9e5cd1c9c2b3c6925d8d3fa76a29dabf73:nagachika
Copy from bundled gem source for test --- common.mk | 13 +++++++---- defs/gmake.mk | 4 ++++ tool/gem-unpack.rb | 63 +++++++++++++++++++++++++++++++++++------------------- 3 files changed, 54 insertions(+), 26 deletions(-)
2022-10-20merge revision(s) 87d8d25796df3865b5a0c9069c604e475a28027f:nagachika
Use configured GIT --- common.mk | 4 ++-- defs/gmake.mk | 68 +++++++++++++++++++++++++++++------------------------------ 2 files changed, 36 insertions(+), 36 deletions(-)
2022-10-20merge revision(s) abc4a46046c326263683a8b3611775c2ddd56a71:nagachika
Get rid of building main again when test-bundled-gems --- .github/workflows/ubuntu.yml | 1 + .github/workflows/yjit-ubuntu.yml | 1 + common.mk | 3 ++- defs/gmake.mk | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-)
2022-10-20merge revision(s) 071653ecd79287661c795400797a5402c4322129:nagachika
Run the prerequisites of test-bundled-gems in order --- common.mk | 6 +++++- defs/gmake.mk | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-)
2022-10-20merge revision(s) 4f1e0bfacd93c28bff549e2f3603c3b4942429a3:nagachika
Followed up CVE-2022-39253 for bundler examples --- spec/bundler/cache/git_spec.rb | 3 +++ spec/bundler/install/gemfile/git_spec.rb | 9 +++++++++ spec/bundler/update/git_spec.rb | 3 +++ 3 files changed, 15 insertions(+)
2022-10-20merge revision(s) ↵nagachika
dae843f6b7502f921a7e66f39e3714a39d860181,86096a91d55f72620e0f8ca8634da5fa342dc35b: Bypass git submodule add/update with git config protocol.file.allow=always option. Co-authored-by: Nobuyoshi Nakada <nobu@ruby-lang.org> --- test/rubygems/test_gem_source_git.rb | 5 +++++ 1 file changed, 5 insertions(+) [rubygems/rubygems] Use [] instead of double-quotes --- test/rubygems/test_gem_source_git.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
2022-10-19merge revision(s) 1f91dcdab3b530dde93fa29fba8bf60683cd8056:nagachika
Define BOOTSTRAPRUBY from HAVE_BASERUBY --- common.mk | 1 + configure.ac | 8 -------- template/Makefile.in | 7 +++++-- win32/Makefile.sub | 6 ++++-- 4 files changed, 10 insertions(+), 12 deletions(-)
2022-10-18merge revision(s) 6a43245e6cda89eddd105f5a6e0182a7229657af:nagachika
Use BOOTSTRAPRUBY_COMMAND instead of fake.rb directly --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-12 08:45:15 +0000