Skip to content

[pull] master from ruby:master #479

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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Nov 17, 2025
Merged

[pull] master from ruby:master #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d8dfbf
Skip TestCommitEmail if git is not available.
hsbt Nov 17, 2025
c32eb72
The prev_ver of 4.0.0 is 3.4.0
nurse Nov 17, 2025
3bbd45d
Fix `RUBY_API_VERSION_NAME` fallback definition
nobu Nov 17, 2025
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
16 changes: 11 additions & 5 deletions tool/format-release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,17 @@ eom
elsif y != 0
prev_tag = "v#{x}_#{y-1}_0"
prev_ver = "#{x}.#{y-1}.0"
elsif x == 3 && y == 0 && z == 0
prev_tag = "v2_7_0"
prev_ver = "2.7.0"
else
raise "unexpected version for prev_ver '#{version}'"
else # y == 0 && z == 0
case x
when 3
prev_tag = "v2_7_0"
prev_ver = "2.7.0"
when 4
prev_tag = "v3_4_0"
prev_ver = "3.4.0"
else
raise "it doesn't know what is the previous version of '#{version}'"
end
end

uri = "https://cache.ruby-lang.org/pub/tmp/ruby-info-#{version}-draft.yml"
Expand Down
2 changes: 2 additions & 0 deletions tool/test/test_commit_email.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ class TestCommitEmail < Test::Unit::TestCase
STDIN_DELIMITER = "---\n"

def setup
omit 'git command is not available' unless system('git', '--version', out: File::NULL, err: File::NULL)

@ruby = Dir.mktmpdir
Dir.chdir(@ruby) do
git('init', '--initial-branch=master')
Expand Down
4 changes: 3 additions & 1 deletion version.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,15 @@
# endif
# define RUBY_REVISION_STR " "RUBY_BRANCH_NAME" "RUBY_REVISION
# else
# define RUBY_API_VERSION_NAME RUBY_API_VERSION_STR
# define RUBY_REVISION_STR " revision "RUBY_REVISION
# endif
#else
# define RUBY_REVISION "HEAD"
# define RUBY_REVISION_STR ""
#endif
#ifndef RUBY_API_VERSION_NAME
# define RUBY_API_VERSION_NAME RUBY_API_VERSION_STR
#endif
#if !defined RUBY_RELEASE_DATETIME || RUBY_PATCHLEVEL != -1
# undef RUBY_RELEASE_DATETIME
# define RUBY_RELEASE_DATETIME RUBY_RELEASE_DATE
Expand Down