Skip to content

Commit 2279da2

Browse files
authored
Bump the required BASERUBY version to 3.1 (ruby#13321)
1 parent b669811 commit 2279da2

12 files changed

Lines changed: 17 additions & 14 deletions

.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/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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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/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

.github/workflows/wasm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ jobs:
102102
103103
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
104104
with:
105-
ruby-version: '3.0'
105+
ruby-version: '3.1'
106106
bundler: none
107107

108108
- name: Build baseruby

.github/workflows/windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ jobs:
6565
- run: md build
6666
working-directory:
6767

68-
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
68+
- uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
6969
with:
70-
ruby-version: '3.0'
70+
# windows-11-arm has only 3.4.1, 3.4.2, 3.4.3, head
71+
ruby-version: ${{ matrix.os != '11-arm' && '3.1' || '3.4' }}
7172
bundler: none
7273
windows-toolchain: none
73-
if: ${{ matrix.os != '11-arm' }}
7474

7575
- name: Install libraries with scoop
7676
run: |

.github/workflows/yjit-ubuntu.yml

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

138138
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
139139
with:
140-
ruby-version: '3.0'
140+
ruby-version: '3.1'
141141
bundler: none
142142

143143
- uses: ./.github/actions/setup/directories

0 commit comments

Comments
 (0)