Move old OS versions to include: and simplify test matrices

This commit is contained in:
Nobuyoshi Nakada 2024-03-21 16:15:53 +09:00
parent 92f72221f1
commit 9e3077a7a6
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
2 changed files with 10 additions and 15 deletions

View File

@ -26,24 +26,22 @@ jobs:
matrix: matrix:
test_task: ['check'] test_task: ['check']
test_opts: [''] test_opts: ['']
os: os: ['']
- macos-12
- macos-13
- ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
include: include:
- test_task: test-all - test_task: test-all
test_opts: --repeat-count=2 test_opts: --repeat-count=2
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
- test_task: test-bundler-parallel - test_task: test-bundler-parallel
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
- test_task: test-bundled-gems - test_task: test-bundled-gems
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }} - test_task: check
os: macos-12
- test_task: check
os: macos-13
fail-fast: false fail-fast: false
env: env:
GITPULLOPTIONS: --no-tags origin ${{ github.ref }} GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os || (github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14')}}
if: >- if: >-
${{!(false ${{!(false

View File

@ -24,32 +24,29 @@ jobs:
make: make:
strategy: strategy:
matrix: matrix:
os: [ubuntu-22.04, ubuntu-20.04]
test_task: [check] test_task: [check]
arch: [''] arch: ['']
configure: ['cppflags=-DVM_CHECK_MODE'] configure: ['cppflags=-DVM_CHECK_MODE']
os: ['']
# specifying other jobs with `include` to avoid redundant tests # specifying other jobs with `include` to avoid redundant tests
include: include:
- test_task: check - test_task: check
arch: i686 arch: i686
os: ubuntu-22.04
- test_task: check - test_task: check
configure: '--disable-yjit' configure: '--disable-yjit'
os: ubuntu-22.04
- test_task: check - test_task: check
configure: '--enable-shared --enable-load-relative' configure: '--enable-shared --enable-load-relative'
os: ubuntu-22.04
- test_task: test-bundler-parallel - test_task: test-bundler-parallel
os: ubuntu-22.04
- test_task: test-bundled-gems - test_task: test-bundled-gems
os: ubuntu-22.04 - test_task: check
os: ubuntu-20.04
fail-fast: false fail-fast: false
env: env:
GITPULLOPTIONS: --no-tags origin ${{ github.ref }} GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
RUBY_DEBUG: ci RUBY_DEBUG: ci
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os || 'ubuntu-22.04' }}
if: >- if: >-
${{!(false ${{!(false