Skip to content

Commit ed1585b

Browse files
committed
Merge branch 'master' into update/merge-2026-04-21
2 parents 6a69583 + c92f8b0 commit ed1585b

272 files changed

Lines changed: 6135 additions & 2909 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.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ runs:
104104
fetch-depth: ${{ inputs.fetch-depth }}
105105
persist-credentials: false
106106

107-
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
107+
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
108108
with:
109109
path: ${{ inputs.srcdir }}/.downloaded-cache
110110
key: ${{ runner.os }}-${{ runner.arch }}-downloaded-cache
@@ -193,7 +193,7 @@ runs:
193193
INPUT_MAKE_COMMAND: ${{ inputs.make-command }}
194194

195195
- name: clean
196-
uses: gacts/run-and-post-run@81b6ce503cde93862cec047c54652e45c5dca991 # v1.4.3
196+
uses: gacts/run-and-post-run@598d7a875d5620e0457490555b5e18e46082aa47 # v1.4.4
197197
with:
198198
working-directory:
199199
post: |

.github/auto_request_review.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ files:
1111
'defs/jit.mk': [team:jit]
1212
'tool/zjit_bisect.rb': [team:jit]
1313
'doc/jit/*': [team:jit]
14-
# 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.
14+
# Skip files updated by dependabot. It's noisy in notifications, and they're auto-merged anyway.
15+
'yjit/Cargo.lock': []
16+
'zjit/Cargo.lock': []
1517
'.github/workflows/yjit-*.yml': []
1618
'.github/workflows/zjit-*.yml': []
1719
options:

.github/workflows/annocheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
builddir: build
7474
makeup: true
7575

76-
- uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1.299.0
76+
- uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
7777
with:
7878
ruby-version: '3.1'
7979
bundler: none

.github/workflows/auto_request_review.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ jobs:
1414
if: ${{ github.repository == 'ruby/ruby' && github.base_ref == 'master' }}
1515
steps:
1616
- name: Request review based on files changes and/or groups the author belongs to
17-
# Using a fork until https://github.com/necojackarc/auto-request-review/pull/135 is merged
18-
uses: k0kubun/auto-request-review@0df295a0ff5c5d302770f589497280132131c63d # master
17+
uses: necojackarc/auto-request-review@5d3060495e58e9cb41f51de50e808d3135d5374e # master
1918
with:
2019
# scope: public_repo
2120
token: ${{ secrets.MATZBOT_AUTO_REQUEST_REVIEW_TOKEN }}

.github/workflows/auto_review_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
with:
3030
persist-credentials: false
3131

32-
- uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1.299.0
32+
- uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
3333
with:
3434
ruby-version: '3.4'
3535
bundler: none

.github/workflows/baseruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- ruby-3.3
4949

5050
steps:
51-
- uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1.299.0
51+
- uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
5252
with:
5353
ruby-version: ${{ matrix.ruby }}
5454
bundler: none

.github/workflows/bundled_gems.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
with:
3939
token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_AUTO_UPDATE_TOKEN || secrets.GITHUB_TOKEN }}
4040

41-
- uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1.299.0
41+
- uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
4242
with:
4343
ruby-version: 4.0
4444

.github/workflows/check_dependencies.yml

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

4343
- uses: ./.github/actions/setup/directories
4444

45-
- uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1.299.0
45+
- uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
4646
with:
4747
ruby-version: '3.1'
4848
bundler: none

.github/workflows/check_misc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
token: ${{ (github.repository == 'ruby/ruby' && !startsWith(github.event_name, 'pull')) && secrets.MATZBOT_AUTO_UPDATE_TOKEN || secrets.GITHUB_TOKEN }}
2424
persist-credentials: false
2525

26-
- uses: ruby/setup-ruby@3ff19f5e2baf30647122352b96108b1fbe250c64 # v1.299.0
26+
- uses: ruby/setup-ruby@7372622e62b60b3cb750dcd2b9e32c247ffec26a # v1.302.0
2727
with:
2828
ruby-version: head
2929

@@ -139,7 +139,7 @@ jobs:
139139
}}
140140
141141
- name: Upload docs
142-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
142+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
143143
with:
144144
path: html
145145
name: ${{ steps.docs.outputs.htmlout }}

.github/workflows/check_sast.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
persist-credentials: false
4646

4747
- name: Run zizmor
48-
uses: zizmorcore/zizmor-action@71321a20a9ded102f6e9ce5718a2fcec2c4f70d8 # v0.5.2
48+
uses: zizmorcore/zizmor-action@b1d7e1fb5de872772f31590499237e7cce841e8e # v0.5.3
4949
continue-on-error: true
5050

5151
analyze:
@@ -78,14 +78,14 @@ jobs:
7878
persist-credentials: false
7979

8080
- name: Initialize CodeQL
81-
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
81+
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
8282
with:
8383
languages: ${{ matrix.language }}
8484
build-mode: none
8585
config-file: .github/codeql/codeql-config.yml
8686

8787
- name: Perform CodeQL Analysis
88-
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
88+
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
8989
with:
9090
category: '/language:${{ matrix.language }}'
9191
upload: False
@@ -126,7 +126,7 @@ jobs:
126126
continue-on-error: true
127127

128128
- name: Upload SARIF
129-
uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
129+
uses: github/codeql-action/upload-sarif@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
130130
with:
131131
sarif_file: sarif-results/${{ matrix.language }}.sarif
132132
continue-on-error: true

0 commit comments

Comments
 (0)