Bump the required BASERUBY version to 3.1 (#13321)

This commit is contained in:
Takashi Kokubun 2025-05-13 13:39:45 -07:00 committed by GitHub
parent b6698114e6
commit 2279da2c91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
Notes: git 2025-05-13 20:39:58 +00:00
Merged-By: k0kubun <takashikkbn@gmail.com>
12 changed files with 17 additions and 14 deletions

View File

@ -76,7 +76,7 @@ jobs:
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0 - uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
with: with:
ruby-version: '3.0' ruby-version: '3.1'
bundler: none bundler: none
# Minimal flags to pass the check. # Minimal flags to pass the check.

View File

@ -45,7 +45,6 @@ jobs:
strategy: strategy:
matrix: matrix:
ruby: ruby:
- ruby-3.0
- ruby-3.1 - ruby-3.1
- ruby-3.2 - ruby-3.2
- ruby-3.3 - ruby-3.3

View File

@ -42,7 +42,7 @@ jobs:
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0 - uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
with: with:
ruby-version: '3.0' ruby-version: '3.1'
bundler: none bundler: none
- name: Run configure - name: Run configure

View File

@ -50,7 +50,6 @@ jobs:
# To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses. # To mitigate flakiness of MinGW CI, we test only one runtime that newer MSYS2 uses.
# Ruby 3.2 is the first Windows Ruby to use OpenSSL 3.x # Ruby 3.2 is the first Windows Ruby to use OpenSSL 3.x
- msystem: 'UCRT64' - msystem: 'UCRT64'
baseruby: '3.2'
test_task: 'check' test_task: 'check'
test-all-opts: '--name=!/TestObjSpace#test_reachable_objects_during_iteration/' test-all-opts: '--name=!/TestObjSpace#test_reachable_objects_during_iteration/'
fail-fast: false fail-fast: false
@ -69,7 +68,7 @@ jobs:
- name: Set up Ruby & MSYS2 - name: Set up Ruby & MSYS2
uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0 uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
with: with:
ruby-version: ${{ matrix.baseruby }} ruby-version: '3.2'
- name: Misc system & package info - name: Misc system & package info
working-directory: working-directory:

View File

@ -65,7 +65,7 @@ jobs:
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0 - uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
with: with:
ruby-version: '3.0' ruby-version: '3.1'
bundler: none bundler: none
if: ${{ contains(matrix.os, 'ubuntu') }} if: ${{ contains(matrix.os, 'ubuntu') }}

View File

@ -60,6 +60,11 @@ jobs:
- uses: ./.github/actions/setup/ubuntu - uses: ./.github/actions/setup/ubuntu
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
with:
ruby-version: '3.1'
bundler: none
- uses: ./.github/actions/setup/directories - uses: ./.github/actions/setup/directories
with: with:
srcdir: src srcdir: src

View File

@ -70,7 +70,7 @@ jobs:
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0 - uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
with: with:
ruby-version: '3.0' ruby-version: '3.1'
bundler: none bundler: none
if: ${{ !endsWith(matrix.os, 'arm') }} if: ${{ !endsWith(matrix.os, 'arm') }}

View File

@ -102,7 +102,7 @@ jobs:
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0 - uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
with: with:
ruby-version: '3.0' ruby-version: '3.1'
bundler: none bundler: none
- name: Build baseruby - name: Build baseruby

View File

@ -65,12 +65,12 @@ jobs:
- run: md build - run: md build
working-directory: working-directory:
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0 - uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
with: with:
ruby-version: '3.0' # windows-11-arm has only 3.4.1, 3.4.2, 3.4.3, head
ruby-version: ${{ matrix.os != '11-arm' && '3.1' || '3.4' }}
bundler: none bundler: none
windows-toolchain: none windows-toolchain: none
if: ${{ matrix.os != '11-arm' }}
- name: Install libraries with scoop - name: Install libraries with scoop
run: | run: |

View File

@ -137,7 +137,7 @@ jobs:
- uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0 - uses: ruby/setup-ruby@d8d83c3960843afb664e821fed6be52f37da5267 # v1.231.0
with: with:
ruby-version: '3.0' ruby-version: '3.1'
bundler: none bundler: none
- uses: ./.github/actions/setup/directories - uses: ./.github/actions/setup/directories

View File

@ -75,7 +75,7 @@ jobs:
- uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0 - uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
with: with:
ruby-version: '3.0' ruby-version: '3.1'
bundler: none bundler: none
- uses: taiki-e/install-action@v2 - uses: taiki-e/install-action@v2

View File

@ -18,6 +18,6 @@
: ; abort () { exit 1; } : ; abort () { exit 1; }
call :warn "executable host ruby is required. use --with-baseruby option." call :warn "executable host ruby is required. use --with-baseruby option."
call :warn "Note that BASERUBY must be Ruby 3.0.0 or later." call :warn "Note that BASERUBY must be Ruby 3.1.0 or later."
call :abort call :abort
: || (:^; abort if RUBY_VERSION < s[%r"warn .*Ruby ([\d.]+)(?:\.0)?",1]) : || (:^; abort if RUBY_VERSION < s[%r"warn .*Ruby ([\d.]+)(?:\.0)?",1])