Skip to content

Commit 730a0c2

Browse files
committed
Merge remote-tracking branch 'upstream/master' into Ractor-Local-GC-version-3
2 parents 374509f + 0232c31 commit 730a0c2

File tree

184 files changed

+37526
-7468
lines changed

Some content is hidden

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

184 files changed

+37526
-7468
lines changed

.document

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ thread_sync.rb
3030
trace_point.rb
3131
warning.rb
3232
yjit.rb
33+
zjit.rb
3334

3435
# Errno::*
3536
known_errors.inc

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
*.gemspec diff=ruby
22
*.rb diff=ruby
3+
*.inc.rs linguist-generated=true
34
bin svn-properties=svn:ignore=ruby
45
bin/* diff=ruby
56
tool/update-deps diff=ruby

.github/workflows/annocheck.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- run: id
6464
working-directory:
6565

66-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
66+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6767
with:
6868
sparse-checkout-cone-mode: false
6969
sparse-checkout: /.github
@@ -74,7 +74,7 @@ jobs:
7474
builddir: build
7575
makeup: true
7676

77-
- uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
77+
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
7878
with:
7979
ruby-version: '3.0'
8080
bundler: none

.github/workflows/baseruby.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ jobs:
5151
- ruby-3.3
5252

5353
steps:
54-
- uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
54+
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
5555
with:
5656
ruby-version: ${{ matrix.ruby }}
5757
bundler: none
5858

59-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
59+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6060

6161
- uses: ./.github/actions/setup/ubuntu
6262

.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@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
34+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3535
with:
3636
token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
3737

.github/workflows/check_dependencies.yml

Lines changed: 2 additions & 2 deletions
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@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
33+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3434

3535
- uses: ./.github/actions/setup/ubuntu
3636
if: ${{ contains(matrix.os, 'ubuntu') }}
@@ -40,7 +40,7 @@ jobs:
4040

4141
- uses: ./.github/actions/setup/directories
4242

43-
- uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
43+
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
4444
with:
4545
ruby-version: '3.0'
4646
bundler: none

.github/workflows/check_misc.yml

Lines changed: 14 additions & 6 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@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
21+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222
with:
2323
token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
2424

@@ -28,14 +28,22 @@ jobs:
2828
# Skip overwriting MATZBOT_GITHUB_TOKEN
2929
checkout: '' # false (ref: https://github.com/actions/runner/issues/2238)
3030

31-
- name: Check if C-sources are US-ASCII
31+
# Run this step first to make sure auto-style commits are pushed
32+
- name: ${{ (github.repository == 'ruby/ruby' && github.ref == 'refs/heads/master') && 'Auto-correct' || 'Check for' }} code styles
3233
run: |
33-
grep -r -n --include='*.[chyS]' --include='*.asm' $'[^\t-~]' -- . && exit 1 || :
34+
set -x
35+
ruby tool/auto-style.rb "$GITHUB_OLD_SHA" "$GITHUB_NEW_SHA" "$PUSH_REF"
36+
env:
37+
38+
GIT_AUTHOR_NAME: git
39+
GIT_COMMITTER_NAME: git
40+
GITHUB_OLD_SHA: ${{ startsWith(github.event_name, 'pull') && github.event.pull_request.base.sha || github.event.before }}
41+
GITHUB_NEW_SHA: ${{ startsWith(github.event_name, 'pull') && github.event.pull_request.merge_commit_sha || github.event.after }}
42+
PUSH_REF: ${{ (github.repository == 'ruby/ruby' && github.ref == 'refs/heads/master') && github.ref || '' }}
3443

35-
- name: Check for trailing spaces
44+
- name: Check if C-sources are US-ASCII
3645
run: |
37-
git grep -I -n $'[\t ]$' -- '*.rb' '*.[chy]' '*.rs' '*.yml' && exit 1 || :
38-
git grep -n $'^[\t ][\t ]*$' -- '*.md' && exit 1 || :
46+
grep -r -n --include='*.[chyS]' --include='*.asm' $'[^\t-~]' -- . && exit 1 || :
3947
4048
- name: Check for bash specific substitution in configure.ac
4149
run: |

.github/workflows/codeql-analysis.yml

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

6161
steps:
6262
- name: Checkout repository
63-
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
63+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6464

6565
- name: Install libraries
6666
if: ${{ contains(matrix.os, 'macos') }}

.github/workflows/compilers.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
timeout-minutes: 60
5454
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
5555
steps:
56-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
56+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5757
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
5858
# Set fetch-depth: 10 so that Launchable can receive commits information.
5959
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
@@ -75,7 +75,7 @@ jobs:
7575
timeout-minutes: 60
7676
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
7777
steps:
78-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
78+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7979
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
8080
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
8181
- name: 'GCC 13 LTO'
@@ -103,7 +103,7 @@ jobs:
103103
timeout-minutes: 60
104104
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
105105
steps:
106-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
106+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
107107
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
108108
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
109109
- { uses: './.github/actions/compilers', name: 'clang 21', with: { tag: 'clang-21' } }
@@ -123,7 +123,7 @@ jobs:
123123
timeout-minutes: 60
124124
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
125125
steps:
126-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
126+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
127127
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
128128
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
129129
- { uses: './.github/actions/compilers', name: 'clang 13', with: { tag: 'clang-13' } }
@@ -144,7 +144,7 @@ jobs:
144144
timeout-minutes: 60
145145
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
146146
steps:
147-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
147+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
148148
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
149149
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
150150
# -Wno-strict-prototypes is necessary with current clang-15 since
@@ -170,7 +170,7 @@ jobs:
170170
timeout-minutes: 60
171171
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
172172
steps:
173-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
173+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
174174
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
175175
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
176176
- { uses: './.github/actions/compilers', name: 'C++20', with: { CXXFLAGS: '-std=c++20 -Werror=pedantic -pedantic-errors -Wno-c++11-long-long' } }
@@ -190,7 +190,7 @@ jobs:
190190
timeout-minutes: 60
191191
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
192192
steps:
193-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
193+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
194194
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
195195
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
196196
- { uses: './.github/actions/compilers', name: 'disable-jit', with: { append_configure: '--disable-yjit' } }
@@ -210,7 +210,7 @@ jobs:
210210
timeout-minutes: 60
211211
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
212212
steps:
213-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
213+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
214214
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
215215
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
216216
- { uses: './.github/actions/compilers', name: 'NDEBUG', with: { cppflags: '-DNDEBUG' } }
@@ -230,7 +230,7 @@ jobs:
230230
timeout-minutes: 60
231231
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
232232
steps:
233-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
233+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
234234
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
235235
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
236236
- { uses: './.github/actions/compilers', name: 'HASH_DEBUG', with: { cppflags: '-DHASH_DEBUG' } }
@@ -250,7 +250,7 @@ jobs:
250250
timeout-minutes: 60
251251
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
252252
steps:
253-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
253+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
254254
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
255255
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
256256
- { uses: './.github/actions/compilers', name: 'USE_LAZY_LOAD', with: { cppflags: '-DUSE_LAZY_LOAD' } }
@@ -270,7 +270,7 @@ jobs:
270270
timeout-minutes: 60
271271
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
272272
steps:
273-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
273+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
274274
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
275275
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
276276
- { uses: './.github/actions/compilers', name: 'GC_DEBUG_STRESS_TO_CLASS', with: { cppflags: '-DGC_DEBUG_STRESS_TO_CLASS' } }
@@ -290,7 +290,7 @@ jobs:
290290
timeout-minutes: 60
291291
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
292292
steps:
293-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
293+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
294294
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
295295
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
296296
- { uses: './.github/actions/compilers', name: 'VM_DEBUG_BP_CHECK', with: { cppflags: '-DVM_DEBUG_BP_CHECK' } }

.github/workflows/cygwin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- run: git config --global core.autocrlf input
4444

45-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
45+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4646

4747
- name: Setup Cygwin
4848
uses: cygwin/cygwin-install-action@master

0 commit comments

Comments
 (0)