Skip to content

Commit 42eae12

Browse files
committed
Merge branch 'master' into dev/mmtk-overrides-default
2 parents febebee + 5a4faaa commit 42eae12

465 files changed

Lines changed: 17142 additions & 8657 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ e63a2115f64433b21cb5dd67c5bf8b30f87ef293
1010
712ac99e4d0384a941c80a9f48f62943ba7d97c0
1111
d1474affa8e105bece209cc9d594bb0a989859e1
1212
2da92388b948821269b18d6b178a680f17e41750
13+
5062c0c621d887367af8a054e5e5d83d7ec57dd3
1314

1415
# Enable Style/StringLiterals cop for RubyGems/Bundler
1516
d7ffd3fea402239b16833cc434404a7af82d44f3
@@ -36,3 +37,5 @@ a0f7de814ae5c299d6ce99bed5fb308a05d50ba0
3637
d4e24021d39e1f80f0055b55d91f8d5f22e15084
3738
7a56c316418980b8a41fcbdc94067b2bda2ad112
3839
e90282be7ba1bc8e3119f6e1a2c80356ceb3f80a
40+
26a9e0b4e31f7b5a9cbd755e0a15823a8fa51bae
41+
2f53985da9ee593fe524d408256835667938c7d7

.github/actions/compilers/entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ grouped ${srcdir}/configure \
4747
--enable-debug-env \
4848
--disable-install-doc \
4949
--with-ext=-test-/cxxanyargs,+ \
50+
--without-git \
5051
${enable_shared} \
5152
${INPUT_APPEND_CONFIGURE} \
5253
CFLAGS="${INPUT_CFLAGS}" \

.github/actions/setup/directories/action.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ inputs:
1919
Where binaries and other generated contents go. This will be
2020
created if absent.
2121
22+
make-command:
23+
required: false
24+
type: string
25+
default: 'make'
26+
description: >-
27+
The command of `make`.
28+
2229
makeup:
2330
required: false
2431
type: boolean
@@ -88,12 +95,12 @@ runs:
8895
git config --global init.defaultBranch garbage
8996
9097
- if: inputs.checkout
91-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
98+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
9299
with:
93100
path: ${{ inputs.srcdir }}
94101
fetch-depth: ${{ inputs.fetch-depth }}
95102

96-
- uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
103+
- uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
97104
with:
98105
path: ${{ inputs.srcdir }}/.downloaded-cache
99106
key: ${{ runner.os }}-${{ runner.arch }}-downloaded-cache
@@ -169,7 +176,7 @@ runs:
169176
shell: bash
170177
id: clean
171178
run: |
172-
echo distclean='make -C ${{ inputs.builddir }} distclean' >> $GITHUB_OUTPUT
179+
echo distclean='cd ${{ inputs.builddir }} && ${{ inputs.make-command }} distclean' >> $GITHUB_OUTPUT
173180
echo remained-files='find ${{ inputs.builddir }} -ls' >> $GITHUB_OUTPUT
174181
[ "${{ inputs.builddir }}" = "${{ inputs.srcdir }}" ] ||
175182
echo final='rm -rf ${{ inputs.builddir }}' >> $GITHUB_OUTPUT

.github/auto_request_review.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,15 @@ files:
22
'yjit*': [team:jit]
33
'yjit/**/*': [team:jit]
44
'yjit/src/cruby_bindings.inc.rs': []
5-
'doc/yjit/*': [team:jit]
65
'bootstraptest/test_yjit*': [team:jit]
76
'test/ruby/test_yjit*': [team:jit]
87
'zjit*': [team:jit]
98
'zjit/**/*': [team:jit]
109
'zjit/src/cruby_bindings.inc.rs': []
11-
'doc/zjit*': [team:jit]
1210
'test/ruby/test_zjit*': [team:jit]
1311
'defs/jit.mk': [team:jit]
1412
'tool/zjit_bisect.rb': [team:jit]
13+
'doc/jit/*': [team:jit]
1514
# Skip github workflow files because the team don't necessarily need to review dependabot updates for GitHub Actions. It's noisy in notifications, and they're auto-merged anyway.
1615
options:
1716
ignore_draft: true

.github/workflows/annocheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- run: id
6262
working-directory:
6363

64-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
64+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
6565
with:
6666
sparse-checkout-cone-mode: false
6767
sparse-checkout: /.github

.github/workflows/auto_review_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout repository
22-
uses: actions/checkout@v5.0.1
22+
uses: actions/checkout@v6.0.1
2323

2424
- uses: ruby/setup-ruby@ab177d40ee5483edb974554986f56b33477e21d0 # v1.265.0
2525
with:

.github/workflows/baseruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
ruby-version: ${{ matrix.ruby }}
5454
bundler: none
5555

56-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
56+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5757

5858
- uses: ./.github/actions/setup/ubuntu
5959

.github/workflows/bundled_gems.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232

3333
steps:
34-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
34+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3535
with:
3636
token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_AUTO_UPDATE_TOKEN || secrets.GITHUB_TOKEN }}
3737

.github/workflows/check_dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
runs-on: ${{ matrix.os }}
3131

3232
steps:
33-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
33+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
3434

3535
- uses: ./.github/actions/setup/ubuntu
3636
if: ${{ contains(matrix.os, 'ubuntu') }}

.github/workflows/check_misc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
21+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
2222
with:
2323
token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_AUTO_UPDATE_TOKEN || secrets.GITHUB_TOKEN }}
2424

@@ -65,7 +65,7 @@ jobs:
6565
echo RDOC='ruby -W0 --disable-gems tool/rdoc-srcdir -q' >> $GITHUB_ENV
6666
6767
- name: Checkout rdoc
68-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
68+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
6969
with:
7070
repository: ruby/rdoc
7171
ref: ${{ steps.rdoc.outputs.ref }}
@@ -103,7 +103,7 @@ jobs:
103103
}}
104104
105105
- name: Upload docs
106-
uses: actions/upload-artifact@v5
106+
uses: actions/upload-artifact@v6.0.0
107107
with:
108108
path: html
109109
name: ${{ steps.docs.outputs.htmlout }}

0 commit comments

Comments
 (0)