Skip to content

[pull] master from ruby:master #1292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 6 commits into from
Aug 8, 2026
Merged

[pull] master from ruby:master #1292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
19a4d1f
[ruby/io-console] bump up to 0.9.0
nobu Aug 8, 2026
1e2ad63
Update default gems list at 19a4d1f745764b20610cb9754a2fa1 [ci skip]
matzbot Aug 8, 2026
769c8a1
[DOC] Update bundled gems list at 1e2ad6342b78705818da600ba818ec
matzbot Aug 8, 2026
e56f452
[ruby/io-console] Fix failures in ruby-core
nobu Aug 8, 2026
9f50e4e
Stop checking `#include` changes [ci skip]
nobu Aug 8, 2026
7187006
[ruby/mmtk] Skip test_profiler_raw_data_with_another_ractor
peterzhu2118 Aug 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ They are still available on rubygems.org and can be installed with
* erb 6.0.7
* 6.0.1 to [v6.0.1.1][erb-v6.0.1.1], [v6.0.2][erb-v6.0.2], [v6.0.3][erb-v6.0.3], [v6.0.4][erb-v6.0.4], [v6.0.5][erb-v6.0.5], [v6.0.6][erb-v6.0.6], [v6.0.7][erb-v6.0.7]
* error_highlight 0.7.2
* io-console 0.9.0
* 0.8.2 to [v0.9.0][io-console-v0.9.0]
* ipaddr 1.2.9
* 1.2.8 to [v1.2.9][ipaddr-v1.2.9]
* json 2.21.2
Expand Down Expand Up @@ -385,6 +387,7 @@ A lot of work has gone into making Ractors more stable, performant, and usable.
[erb-v6.0.5]: https://github.com/ruby/erb/releases/tag/v6.0.5
[erb-v6.0.6]: https://github.com/ruby/erb/releases/tag/v6.0.6
[erb-v6.0.7]: https://github.com/ruby/erb/releases/tag/v6.0.7
[io-console-v0.9.0]: https://github.com/ruby/io-console/releases/tag/v0.9.0
[ipaddr-v1.2.9]: https://github.com/ruby/ipaddr/releases/tag/v1.2.9
[json-v2.18.1]: https://github.com/ruby/json/releases/tag/v2.18.1
[json-v2.19.0]: https://github.com/ruby/json/releases/tag/v2.19.0
Expand Down
7 changes: 1 addition & 6 deletions common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,12 +846,7 @@ clean-spec: PHONY

check: main $(DOT_WAIT) test $(DOT_WAIT) test-tool $(DOT_WAIT) test-all
$(ECHO) check succeeded
-$(Q) : : "run only on sh"; \
if [ x"$(GIT)" != x ] && $(CHDIR) "$(srcdir)" && \
b=`$(GIT) symbolic-ref --short HEAD 2>&1` && \
u=`$(GIT) branch --list --format='%(upstream:short)' $$b`; then \
set -x; $(GIT) --no-pager log --format=oneline -G '^ *# *include *("|<ruby)' $$u..HEAD --; \
fi

check-ruby: test test-ruby

fake: $(CROSS_COMPILING)-fake
Expand Down
2 changes: 1 addition & 1 deletion ext/io/console/console.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

static const char *const
IO_CONSOLE_VERSION = "0.8.2";
IO_CONSOLE_VERSION = "0.9.0";

#include "ruby.h"
#include "ruby/io.h"
Expand Down
1 change: 1 addition & 0 deletions test/.excludes-mmtk/TestGc.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
exclude(:test_profiler_raw_data_limit, "MMTk does not have GC::Profiler")
exclude(:test_profiler_raw_data_reports_compaction_separately_from_sweep_wall_time, "MMTk does not have GC::Profiler")
exclude(:test_profiler_raw_data_includes_wall_time, "MMTk does not have GC::Profiler")
exclude(:test_profiler_raw_data_with_another_ractor, "MMTk does not have GC::Profiler")
exclude(:test_profiler_total_time, "MMTk does not have GC::Profiler")
exclude(:test_start_full_mark, "testing behaviour specific to default GC")
exclude(:test_start_immediate_sweep, "testing behaviour specific to default GC")
Expand Down