Skip to content

[pull] master from ruby:master #342

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 10 commits into from
Oct 9, 2025
Merged

[pull] master from ruby:master #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
501dd27
post_push.yml: Write the SSH key more securely
k0kubun Oct 8, 2025
7ec03e1
post_push.yml: Migrate commit-email.rb to post_push (#14779)
k0kubun Oct 8, 2025
5b8f47f
post_push.yml: Specify the full path of sendmail
k0kubun Oct 8, 2025
86d9733
Add RUBY_FREE_AT_EXIT to MANDATORY_ENVS in test_process.rb
peterzhu2118 Oct 6, 2025
a48592a
Let test-tool accept $(TESTS) like test-all does
k0kubun Oct 8, 2025
fc08d36
post_push.yml: Rename commit-mail.rb back
k0kubun Oct 8, 2025
0508786
Migrate a test for commit-email.rb (#14784)
k0kubun Oct 8, 2025
afb21f3
test_commit_email.rb: Stop printing LoadError
k0kubun Oct 8, 2025
dbb5972
commit-email.rb: Use base64 instead of nkf
k0kubun Oct 8, 2025
77b62a8
Revert "commit-email.rb: Use base64 instead of nkf"
k0kubun Oct 9, 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: 14 additions & 2 deletions .github/workflows/post_push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ jobs:
- name: Sync git.ruby-lang.org
run: |
mkdir -p ~/.ssh
echo "$RUBY_GIT_SYNC_PRIVATE_KEY" > ~/.ssh/id_ed25519
chmod 600 ~/.ssh/id_ed25519
(umask 066; printenv RUBY_GIT_SYNC_PRIVATE_KEY > ~/.ssh/id_ed25519)
ssh-keyscan -t ed25519 git.ruby-lang.org >> ~/.ssh/known_hosts
ssh -i ~/.ssh/id_ed25519 git-sync@git.ruby-lang.org "sudo -u git /home/git/git.ruby-lang.org/bin/update-ruby.sh $GITHUB_REF"
env:
Expand Down Expand Up @@ -44,6 +43,19 @@ jobs:
SLACK_WEBHOOK_URL_RUBY_JP: ${{ secrets.SLACK_WEBHOOK_URL_RUBY_JP }}
if: ${{ github.ref == 'refs/heads/master' }}

- name: Notify commit to ruby-cvs
run: |
SENDMAIL="ssh -i ${HOME}/.ssh/id_ed25519 git-sync@git.ruby-lang.org /usr/sbin/sendmail" \
ruby tool/commit-email.rb . ruby-cvs@g.ruby-lang.org \
"$GITHUB_OLD_SHA" "$GITHUB_NEW_SHA" "$GITHUB_REF" \
--viewer-uri "https://github.com/ruby/ruby/commit/" \
--error-to cvs-admin@ruby-lang.org
env:
GITHUB_OLD_SHA: ${{ github.event.before }}
GITHUB_NEW_SHA: ${{ github.event.after }}
GITHUB_REF: ${{ github.ref }}
if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/ruby_') }}

- name: Auto-correct code styles
run: |
set -x
Expand Down
2 changes: 1 addition & 1 deletion common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,7 +887,7 @@ no-test-testframework: PHONY
test-tool: $(TEST_RUNNABLE)-test-tool
yes-test-tool: prog PHONY
$(ACTIONS_GROUP)
$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TOOL_TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS)
$(gnumake_recursive)$(Q)$(exec) $(RUNRUBY) "$(TOOL_TESTSDIR)/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) $(TESTS)
$(ACTIONS_ENDGROUP)
no-test-tool: PHONY

Expand Down
2 changes: 1 addition & 1 deletion test/ruby/test_process.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ def test_overwrite_ENV
end;
end

MANDATORY_ENVS = %w[RUBYLIB GEM_HOME GEM_PATH]
MANDATORY_ENVS = %w[RUBYLIB GEM_HOME GEM_PATH RUBY_FREE_AT_EXIT]
case RbConfig::CONFIG['target_os']
when /linux/
MANDATORY_ENVS << 'LD_PRELOAD'
Expand Down
Loading