Skip to content

Commit f179f13

Browse files
nobunobu
authored
Merge branch 'master' into heap_prepare_page_no_vm_barrier
2 parents 4552e5c + 5e90d9e commit f179f13

File tree

361 files changed

+7403
-5494
lines changed

Some content is hidden

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

361 files changed

+7403
-5494
lines changed

‎.github/actions/capiext/action.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: rubyspec C-API extensions
2+
3+
inputs:
4+
builddir:
5+
required: false
6+
default: '.'
7+
make:
8+
required: false
9+
default: 'make -s'
10+
11+
outputs:
12+
key:
13+
value: >-
14+
${{
15+
!steps.restore.outputs.cache-hit &&
16+
github.ref == 'refs/heads/master' &&
17+
steps.config.outputs.key
18+
}}
19+
20+
runs:
21+
using: composite
22+
23+
steps:
24+
- id: config
25+
shell: bash
26+
run: |
27+
eval $(grep -e '^arch *=' -e '^ruby_version *=' -e '^DLEXT *=' Makefile |
28+
sed 's/ *= */=/')
29+
case "${ruby_version}" in
30+
*+*) key=capiexts-${arch}-${ruby_version};;
31+
*) key=;;
32+
esac
33+
echo version=$ruby_version >> $GITHUB_OUTPUT
34+
echo key=$key >> $GITHUB_OUTPUT
35+
echo DLEXT=$DLEXT >> $GITHUB_OUTPUT
36+
working-directory: ${{ inputs.builddir }}
37+
38+
- name: CAPI extensions cache
39+
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
40+
id: cache
41+
with:
42+
path: ${{ inputs.builddir }}/spec/ruby/optional/capi/ext/
43+
key: ${{ steps.config.outputs.key }}
44+
if: ${{ steps.config.outputs.key }}
45+
46+
- name: Run test-spec with previous CAPI extension binaries
47+
id: check
48+
shell: bash
49+
run: |
50+
touch spec/ruby/optional/capi/ext/*.$DLEXT
51+
[ ! -f spec/ruby/optional/capi/ext/\*.$DLEXT ]
52+
${{ inputs.make }} SPECOPTS=optional/capi test-spec
53+
env:
54+
DLEXT: ${{ steps.config.outputs.DLEXT }}
55+
working-directory: ${{ inputs.builddir }}
56+
if: ${{ steps.cache.outputs.cache-hit }}
57+
58+
- shell: bash
59+
run: |
60+
echo "::error::Change from ${prev} detected; bump up ABI version"
61+
env:
62+
prev: ${{ steps.config.outputs.version }}
63+
if: ${{ always() && steps.check.outcome == 'failure' }}

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

Lines changed: 1 addition & 1 deletion
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
91+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
9292
with:
9393
path: ${{ inputs.srcdir }}
9494
fetch-depth: ${{ inputs.fetch-depth }}

‎.github/auto_request_review.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ files:
1010
'zjit/src/cruby_bindings.inc.rs': []
1111
'doc/zjit*': [team:jit]
1212
'test/ruby/test_zjit*': [team:jit]
13-
'test/.excludes-zjit/*': [team:jit]
1413
'defs/jit.mk': [team:jit]
1514
options:
1615
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
64+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6565
with:
6666
sparse-checkout-cone-mode: false
6767
sparse-checkout: /.github

‎.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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
56+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
34+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
33+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3434

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

‎.github/workflows/check_misc.yml‎

Lines changed: 1 addition & 1 deletion
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
21+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2222
with:
2323
token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_AUTO_UPDATE_TOKEN || secrets.GITHUB_TOKEN }}
2424

‎.github/workflows/codeql-analysis.yml‎

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

5959
steps:
6060
- name: Checkout repository
61-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
61+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6262

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

‎.github/workflows/compilers.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
timeout-minutes: 60
5252
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
5353
steps:
54-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
54+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5555
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
5656
# Set fetch-depth: 10 so that Launchable can receive commits information.
5757
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
@@ -73,7 +73,7 @@ jobs:
7373
timeout-minutes: 60
7474
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
7575
steps:
76-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
76+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
7777
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
7878
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
7979
- name: 'GCC 15 LTO'
@@ -102,7 +102,7 @@ jobs:
102102
timeout-minutes: 60
103103
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
104104
steps:
105-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
105+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
106106
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
107107
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
108108
- { uses: './.github/actions/compilers', name: 'clang 22', with: { tag: 'clang-22' } }
@@ -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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
126+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
147+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
173+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
193+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
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 --disable-zjit' } }
@@ -212,7 +212,7 @@ jobs:
212212
timeout-minutes: 60
213213
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
214214
steps:
215-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
215+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
216216
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
217217
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
218218
- { uses: './.github/actions/compilers', name: 'NDEBUG', with: { cppflags: '-DNDEBUG' } }
@@ -232,7 +232,7 @@ jobs:
232232
timeout-minutes: 60
233233
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
234234
steps:
235-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
235+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
236236
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
237237
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
238238
- { uses: './.github/actions/compilers', name: 'HASH_DEBUG', with: { cppflags: '-DHASH_DEBUG' } }
@@ -252,7 +252,7 @@ jobs:
252252
timeout-minutes: 60
253253
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
254254
steps:
255-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
255+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
256256
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
257257
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
258258
- { uses: './.github/actions/compilers', name: 'USE_LAZY_LOAD', with: { cppflags: '-DUSE_LAZY_LOAD' } }
@@ -272,7 +272,7 @@ jobs:
272272
timeout-minutes: 60
273273
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
274274
steps:
275-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
275+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
276276
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
277277
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
278278
- { uses: './.github/actions/compilers', name: 'GC_DEBUG_STRESS_TO_CLASS', with: { cppflags: '-DGC_DEBUG_STRESS_TO_CLASS' } }
@@ -292,7 +292,7 @@ jobs:
292292
timeout-minutes: 60
293293
services: { docuum: { image: 'stephanmisc/docuum', options: '--init', volumes: [ '/root', '/var/run/docker.sock:/var/run/docker.sock' ] } }
294294
steps:
295-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
295+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
296296
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
297297
- { uses: './.github/actions/setup/directories', with: { srcdir: 'src', builddir: 'build', makeup: true, fetch-depth: 10 } }
298298
- { uses: './.github/actions/compilers', name: 'VM_DEBUG_BP_CHECK', with: { cppflags: '-DVM_DEBUG_BP_CHECK' } }
@@ -321,7 +321,7 @@ jobs:
321321
- 'compileB'
322322
- 'compileC'
323323
steps:
324-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
324+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
325325
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
326326
- uses: ./.github/actions/slack
327327
with:

0 commit comments

Comments
 (0)