diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2024-03-21 16:15:53 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2024-03-21 16:15:53 +0900 |
| commit | 9e3077a7a6a59512aea5538adf173a33bbc5db3f (patch) | |
| tree | 339e0099b4b99618478c601919ad171f702bbf2f | |
| parent | 92f72221f1823c8c4288898585460f879d28945c (diff) | |
Move old OS versions to `include:` and simplify test matrices
| -rw-r--r-- | .github/workflows/macos.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/ubuntu.yml | 11 |
2 files changed, 10 insertions, 15 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 48e2018150..8fa946fb82 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -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 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 80a76cfaeb..95f7e97d18 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -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 |