Move old OS versions to include:
and simplify test matrices
This commit is contained in:
parent
92f72221f1
commit
9e3077a7a6
14
.github/workflows/macos.yml
vendored
14
.github/workflows/macos.yml
vendored
@ -26,24 +26,22 @@ jobs:
|
||||
matrix:
|
||||
test_task: ['check']
|
||||
test_opts: ['']
|
||||
os:
|
||||
- macos-12
|
||||
- macos-13
|
||||
- ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||
os: ['']
|
||||
include:
|
||||
- test_task: test-all
|
||||
test_opts: --repeat-count=2
|
||||
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||
- test_task: test-bundler-parallel
|
||||
os: ${{ github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14' }}
|
||||
- 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
|
||||
|
||||
env:
|
||||
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os || (github.repository == 'ruby/ruby' && 'macos-arm-oss' || 'macos-14')}}
|
||||
|
||||
if: >-
|
||||
${{!(false
|
||||
|
11
.github/workflows/ubuntu.yml
vendored
11
.github/workflows/ubuntu.yml
vendored
@ -24,32 +24,29 @@ jobs:
|
||||
make:
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-22.04, ubuntu-20.04]
|
||||
test_task: [check]
|
||||
arch: ['']
|
||||
configure: ['cppflags=-DVM_CHECK_MODE']
|
||||
os: ['']
|
||||
# specifying other jobs with `include` to avoid redundant tests
|
||||
include:
|
||||
- test_task: check
|
||||
arch: i686
|
||||
os: ubuntu-22.04
|
||||
- test_task: check
|
||||
configure: '--disable-yjit'
|
||||
os: ubuntu-22.04
|
||||
- test_task: check
|
||||
configure: '--enable-shared --enable-load-relative'
|
||||
os: ubuntu-22.04
|
||||
- test_task: test-bundler-parallel
|
||||
os: ubuntu-22.04
|
||||
- test_task: test-bundled-gems
|
||||
os: ubuntu-22.04
|
||||
- test_task: check
|
||||
os: ubuntu-20.04
|
||||
fail-fast: false
|
||||
|
||||
env:
|
||||
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
|
||||
RUBY_DEBUG: ci
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
runs-on: ${{ matrix.os || 'ubuntu-22.04' }}
|
||||
|
||||
if: >-
|
||||
${{!(false
|
||||
|
Loading…
x
Reference in New Issue
Block a user