Skip to content

Commit 674f8e6

Browse files
committed
Merge remote-tracking branch 'gh/master' into yjit-zjit-combo-build
2 parents 47f0187 + 9400119 commit 674f8e6

454 files changed

Lines changed: 11943 additions & 6691 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/workflows/annocheck.yml

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

7777
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
7878
with:
79-
ruby-version: '3.0'
79+
ruby-version: '3.1'
8080
bundler: none
8181

8282
# Minimal flags to pass the check.

.github/workflows/baseruby.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ jobs:
4545
strategy:
4646
matrix:
4747
ruby:
48-
- ruby-3.0
4948
- ruby-3.1
5049
- ruby-3.2
5150
- ruby-3.3

.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: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
4444
with:
45-
ruby-version: '3.0'
45+
ruby-version: '3.1'
4646
bundler: none
4747

4848
- name: Run configure

.github/workflows/codeql-analysis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
5151
env:
5252
enable_install_doc: no
53-
CODEQL_ACTION_CLEANUP_TRAP_CACHES: true
5453

5554
strategy:
5655
fail-fast: false
@@ -121,3 +120,9 @@ jobs:
121120
with:
122121
sarif_file: sarif-results/${{ matrix.language }}.sarif
123122
continue-on-error: true
123+
124+
- name: Purge the oldest TRAP cache
125+
if: ${{ github.repository == 'ruby/ruby' && matrix.language == 'cpp'}}
126+
run: gh cache list --key codeql --order asc --limit 1 --json key --jq '.[].key' | xargs -I{} gh cache delete {}
127+
env:
128+
GH_TOKEN: ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}

.github/workflows/compilers.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,8 @@ jobs:
320320
- 'compileB'
321321
- 'compileC'
322322
steps:
323+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
324+
with: { sparse-checkout-cone-mode: false, sparse-checkout: /.github }
323325
- uses: ./.github/actions/slack
324326
with:
325327
label: 'omnibus'

.github/workflows/mingw.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
# To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses.
5151
# Ruby 3.2 is the first Windows Ruby to use OpenSSL 3.x
5252
- msystem: 'UCRT64'
53-
baseruby: '3.2'
5453
test_task: 'check'
5554
test-all-opts: '--name=!/TestObjSpace#test_reachable_objects_during_iteration/'
5655
fail-fast: false
@@ -69,7 +68,7 @@ jobs:
6968
- name: Set up Ruby & MSYS2
7069
uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
7170
with:
72-
ruby-version: ${{ matrix.baseruby }}
71+
ruby-version: '3.2'
7372

7473
- name: Misc system & package info
7574
working-directory:

.github/workflows/modgc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
matrix:
2727
gc:
2828
- name: default
29-
- name: mmtk
30-
mmtk_build: release
29+
# - name: mmtk
30+
# mmtk_build: release
3131
os: [macos-latest, ubuntu-latest]
3232
include:
3333
- test_task: check
@@ -65,7 +65,7 @@ jobs:
6565

6666
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
6767
with:
68-
ruby-version: '3.0'
68+
ruby-version: '3.1'
6969
bundler: none
7070
if: ${{ contains(matrix.os, 'ubuntu') }}
7171

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ jobs:
6060

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

63+
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
64+
with:
65+
ruby-version: '3.1'
66+
bundler: none
67+
6368
- uses: ./.github/actions/setup/directories
6469
with:
6570
srcdir: src

.github/workflows/spec_guards.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ jobs:
4141
# Specs from ruby/spec should still run on all supported Ruby versions.
4242
# This also ensures the needed ruby_version_is guards are there, see spec/README.md.
4343
ruby:
44-
- ruby-3.1
4544
- ruby-3.2
4645
- ruby-3.3
4746
- ruby-3.4

.github/workflows/ubuntu.yml

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

7171
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
7272
with:
73-
ruby-version: '3.0'
73+
ruby-version: '3.1'
7474
bundler: none
7575
if: ${{ !endsWith(matrix.os, 'arm') }}
7676

0 commit comments

Comments
 (0)