Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move old OS versions to include: and simplify test matrices #10322

Merged
merged 1 commit into from Mar 21, 2024
Merged

Move old OS versions to include: and simplify test matrices #10322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 6 additions & 8 deletions .github/workflows/macos.yml
View file
Open in desktop
Expand Up @@ -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
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/ubuntu.yml
View file
Open in desktop
Expand Up @@ -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
Expand Down