Skip to content

Commit 8973e65

Browse files
wkswks
committed
Merge branch 'master' into mmtk
2 parents 49e545c + a5cb8c8 commit 8973e65

File tree

431 files changed

+7156
-3537
lines changed

Some content is hidden

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

431 files changed

+7156
-3537
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ runs:
8888
git config --global init.defaultBranch garbage
8989
9090
- if: inputs.checkout
91-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
91+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
9292
with:
9393
path: ${{ inputs.srcdir }}
9494
fetch-depth: ${{ inputs.fetch-depth }}

‎.github/workflows/annocheck.yml

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

66-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
66+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
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@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
77+
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
7878
with:
7979
ruby-version: '3.0'
8080
bundler: none

‎.github/workflows/baseruby.yml

+2-2
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@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
54+
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
5555
with:
5656
ruby-version: ${{ matrix.ruby }}
5757
bundler: none
5858

59-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
59+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
6060

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

‎.github/workflows/bundled_gems.yml

+1-1
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@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
34+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
)}}
4646
4747
steps:
48-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
48+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
4949

5050
- uses: ./.github/actions/setup/ubuntu
5151
if: ${{ contains(matrix.os, 'ubuntu') }}
@@ -55,7 +55,7 @@ jobs:
5555

5656
- uses: ./.github/actions/setup/directories
5757

58-
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
58+
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
5959
with:
6060
ruby-version: '3.0'
6161
bundler: none

‎.github/workflows/check_misc.yml

+1-1
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@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
21+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
2222
with:
2323
token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_GITHUB_TOKEN || secrets.GITHUB_TOKEN }}
2424

‎.github/workflows/codeql-analysis.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
steps:
6565
- name: Checkout repository
66-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
66+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
6767

6868
- name: Install libraries
6969
if: ${{ contains(matrix.os, 'macos') }}
@@ -80,15 +80,15 @@ jobs:
8080
run: sudo rm /usr/lib/ruby/vendor_ruby/rubygems/defaults/operating_system.rb
8181

8282
- name: Initialize CodeQL
83-
uses: github/codeql-action/init@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
83+
uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
8484
with:
8585
languages: ${{ matrix.language }}
8686

8787
- name: Autobuild
88-
uses: github/codeql-action/autobuild@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
88+
uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
8989

9090
- name: Perform CodeQL Analysis
91-
uses: github/codeql-action/analyze@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
91+
uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
9292
with:
9393
category: '/language:${{ matrix.language }}'
9494
upload: False
@@ -118,7 +118,7 @@ jobs:
118118
continue-on-error: true
119119

120120
- name: Upload SARIF
121-
uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
121+
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
122122
with:
123123
sarif_file: sarif-results/${{ matrix.language }}.sarif
124124
continue-on-error: true

‎.github/workflows/compilers.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ jobs:
147147
- { name: disable-rubygems, env: { append_configure: '--disable-rubygems' } }
148148
- { name: RUBY_DEVEL, env: { append_configure: '--enable-devel' } }
149149

150+
- { name: OPT_THREADED_CODE=0, env: { cppflags: '-DOPT_THREADED_CODE=0' } }
150151
- { name: OPT_THREADED_CODE=1, env: { cppflags: '-DOPT_THREADED_CODE=1' } }
151152
- { name: OPT_THREADED_CODE=2, env: { cppflags: '-DOPT_THREADED_CODE=2' } }
152-
- { name: OPT_THREADED_CODE=3, env: { cppflags: '-DOPT_THREADED_CODE=3' } }
153153

154154
- { name: NDEBUG, env: { cppflags: '-DNDEBUG' } }
155155
- { name: RUBY_DEBUG, env: { cppflags: '-DRUBY_DEBUG' } }
@@ -233,7 +233,7 @@ jobs:
233233
- run: id
234234
working-directory:
235235

236-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
236+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
237237
with:
238238
sparse-checkout-cone-mode: false
239239
sparse-checkout: /.github

‎.github/workflows/dependabot_automerge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Dependabot metadata
14-
uses: dependabot/fetch-metadata@0fb21704c18a42ce5aa8d720ea4b912f5e6babef # v2.0.0
14+
uses: dependabot/fetch-metadata@5e5f99653a5b510e8555840e80cbf1514ad4af38 # v2.1.0
1515
id: metadata
1616

1717
- name: Wait for status checks

‎.github/workflows/macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
)}}
5353
5454
steps:
55-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
55+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
5656
with:
5757
sparse-checkout-cone-mode: false
5858
sparse-checkout: /.github

‎.github/workflows/mingw.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
6767
steps:
6868
- name: Set up Ruby & MSYS2
69-
uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
69+
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
7070
with:
7171
ruby-version: ${{ matrix.baseruby }}
7272

@@ -97,7 +97,7 @@ jobs:
9797
$result
9898
working-directory:
9999

100-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
100+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
101101
with:
102102
sparse-checkout-cone-mode: false
103103
sparse-checkout: /.github

‎.github/workflows/prism.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
)}}
5656
5757
steps:
58-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
58+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
5959
with:
6060
sparse-checkout-cone-mode: false
6161
sparse-checkout: /.github
@@ -92,7 +92,7 @@ jobs:
9292
timeout-minutes: 40
9393
env:
9494
GNUMAKEFLAGS: ''
95-
RUBY_TESTOPTS: '-q --tty=no --excludes-dir="../src/test/.excludes-prism" --exclude="test_ast.rb" --exclude="error_highlight/test_error_highlight.rb" --exclude="prism/encoding_test.rb" --exclude="prism/locals_test.rb" --exclude="prism/newline_test.rb"'
95+
RUBY_TESTOPTS: '-q --tty=no --excludes-dir="../src/test/.excludes-prism" --exclude="error_highlight/test_error_highlight.rb" --exclude="prism/encoding_test.rb"'
9696
RUN_OPTS: ${{ matrix.run_opts }}
9797

9898
- name: make test-prism-spec

‎.github/workflows/rjit-bindgen.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ jobs:
4747
4848
steps:
4949
- name: Set up Ruby
50-
uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
50+
uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
5151
with:
5252
ruby-version: '3.1'
5353

54-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
54+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
5555
with:
5656
sparse-checkout-cone-mode: false
5757
sparse-checkout: /.github

‎.github/workflows/rjit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
)}}
5656
5757
steps:
58-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
58+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
5959
with:
6060
sparse-checkout-cone-mode: false
6161
sparse-checkout: /.github

‎.github/workflows/scorecards.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232

3333
steps:
3434
- name: 'Checkout code'
35-
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
35+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
3636
with:
3737
persist-credentials: false
3838

@@ -67,6 +67,6 @@ jobs:
6767

6868
# Upload the results to GitHub's code scanning dashboard.
6969
- name: 'Upload to code-scanning'
70-
uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v2.1.27
70+
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v2.1.27
7171
with:
7272
sarif_file: results.sarif

‎.github/workflows/spec_guards.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ jobs:
4545
- ruby-3.3
4646

4747
steps:
48-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
48+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
4949

50-
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
50+
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
5151
with:
5252
ruby-version: ${{ matrix.ruby }}
5353
bundler: none

‎.github/workflows/ubuntu.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
)}}
5959
6060
steps:
61-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
61+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
6262
with:
6363
sparse-checkout-cone-mode: false
6464
sparse-checkout: /.github
@@ -67,7 +67,7 @@ jobs:
6767
with:
6868
arch: ${{ matrix.arch }}
6969

70-
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
70+
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
7171
with:
7272
ruby-version: '3.0'
7373
bundler: none

‎.github/workflows/wasm.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
)}}
6262
6363
steps:
64-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
64+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
6565
with:
6666
sparse-checkout-cone-mode: false
6767
sparse-checkout: /.github
@@ -100,7 +100,7 @@ jobs:
100100
run: |
101101
echo "WASI_SDK_PATH=/opt/wasi-sdk" >> $GITHUB_ENV
102102
103-
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
103+
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
104104
with:
105105
ruby-version: '3.0'
106106
bundler: none

‎.github/workflows/windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ jobs:
9191
${{ steps.find-tools.outputs.needs }}
9292
if: ${{ steps.find-tools.outputs.needs != '' }}
9393

94-
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
94+
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
9595
with:
9696
ruby-version: '3.0'
9797
bundler: none
@@ -123,7 +123,7 @@ jobs:
123123
Join-Path (Resolve-Path ~).Path "scoop\shims" >> $Env:GITHUB_PATH
124124
shell: pwsh
125125

126-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
126+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
127127
with:
128128
sparse-checkout-cone-mode: false
129129
sparse-checkout: /.github

‎.github/workflows/yjit-macos.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
)}}
3838
3939
steps:
40-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
40+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
4141

4242
- run: RUST_BACKTRACE=1 cargo test
4343
working-directory: yjit
@@ -60,11 +60,13 @@ jobs:
6060
- test_task: 'check'
6161
configure: '--enable-yjit=dev'
6262
yjit_opts: '--yjit-call-threshold=1 --yjit-verify-ctx --yjit-code-gc'
63+
specopts: '-T --yjit-call-threshold=1 -T --yjit-verify-ctx -T --yjit-code-gc'
6364
fail-fast: false
6465

6566
env:
6667
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
6768
RUN_OPTS: ${{ matrix.yjit_opts }}
69+
SPECOPTS: ${{ matrix.specopts }}
6870

6971
runs-on: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
7072

@@ -79,7 +81,7 @@ jobs:
7981
)}}
8082
8183
steps:
82-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
84+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
8385
with:
8486
sparse-checkout-cone-mode: false
8587
sparse-checkout: /.github
@@ -128,6 +130,7 @@ jobs:
128130
run: >-
129131
make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
130132
RUN_OPTS="$RUN_OPTS"
133+
SPECOPTS="$SPECOPTS"
131134
timeout-minutes: 60
132135
env:
133136
RUBY_TESTOPTS: '-q --tty=no'

‎.github/workflows/yjit-ubuntu.yml

+8-6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
)}}
3737
3838
steps:
39-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
39+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
4040

4141
# For now we can't run cargo test --offline because it complains about the
4242
# capstone dependency, even though the dependency is optional
@@ -68,7 +68,7 @@ jobs:
6868
)}}
6969
7070
steps:
71-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
71+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
7272

7373
# Check that we don't have linting errors in release mode, too
7474
- run: cargo clippy --all-targets --all-features
@@ -95,6 +95,7 @@ jobs:
9595
- test_task: 'check'
9696
configure: '--enable-yjit=dev'
9797
yjit_opts: '--yjit-call-threshold=1 --yjit-verify-ctx --yjit-code-gc'
98+
specopts: '-T --yjit-call-threshold=1 -T --yjit-verify-ctx -T --yjit-code-gc'
9899

99100
- test_task: 'test-bundled-gems'
100101
configure: '--enable-yjit=dev'
@@ -108,6 +109,7 @@ jobs:
108109
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
109110
RUN_OPTS: ${{ matrix.yjit_opts }}
110111
YJIT_BENCH_OPTS: ${{ matrix.yjit_bench_opts }}
112+
SPECOPTS: ${{ matrix.specopts }}
111113
RUBY_DEBUG: ci
112114
BUNDLE_JOBS: 8 # for yjit-bench
113115
RUST_BACKTRACE: 1
@@ -125,7 +127,7 @@ jobs:
125127
)}}
126128
127129
steps:
128-
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
130+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
129131
with:
130132
sparse-checkout-cone-mode: false
131133
sparse-checkout: /.github
@@ -145,7 +147,7 @@ jobs:
145147
if: ${{ matrix.rust_version }}
146148
run: rustup install ${{ matrix.rust_version }} --profile minimal
147149

148-
- uses: ruby/setup-ruby@6bd3d993c602f6b675728ebaecb2b569ff86e99b # v1.174.0
150+
- uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # v1.176.0
149151
with:
150152
ruby-version: '3.0'
151153
bundler: none
@@ -179,8 +181,8 @@ jobs:
179181

180182
- name: make ${{ matrix.test_task }}
181183
run: >-
182-
make -s -j ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
183-
RUN_OPTS="$RUN_OPTS" MSPECOPT=--debug
184+
make -s ${{ matrix.test_task }} ${TESTS:+TESTS="$TESTS"}
185+
RUN_OPTS="$RUN_OPTS" MSPECOPT=--debug SPECOPTS="$SPECOPTS"
184186
YJIT_BENCH_OPTS="$YJIT_BENCH_OPTS" YJIT_BINDGEN_DIFF_OPTS="$YJIT_BINDGEN_DIFF_OPTS"
185187
timeout-minutes: 90
186188
env:

0 commit comments

Comments
 (0)