Skip to content

Commit

Permalink
Merge pull request #7618 from rubygems/deivid-rodriguez/latest-ci-rubies
Browse files Browse the repository at this point in the history
Use latest rubies in CI

(cherry picked from commit a59bf6e)
  • Loading branch information
deivid-rodriguez committed Apr 30, 2024
1 parent 39cfd33 commit a00987f
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 58 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/bundler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@ jobs:
- { name: Ubuntu, value: ubuntu-22.04 }

ruby:
- { name: ruby-3.0, value: 3.0.6 }
- { name: ruby-3.1, value: 3.1.4 }
- { name: ruby-3.2, value: 3.2.3 }
- { name: ruby-3.3, value: 3.3.0 }
- { name: ruby-3.0, value: 3.0.7 }
- { name: ruby-3.1, value: 3.1.5 }
- { name: ruby-3.2, value: 3.2.4 }
- { name: ruby-3.3, value: 3.3.1 }

bundler:
- { name: 2, value: '' }
- { name: 3, value: 3.0.0 }

include:
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 }, timeout: 90 }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 }, timeout: 90 }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.3 }, timeout: 90 }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0 }, timeout: 90 }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 }, timeout: 90 }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 }, timeout: 90 }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 }, timeout: 90 }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 }, timeout: 90 }

- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 }, timeout: 150 }
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 }, timeout: 150 }
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.3 }, timeout: 150 }
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0 }, timeout: 150 }
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 }, timeout: 150 }
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 }, timeout: 150 }
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 }, timeout: 150 }
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 }, timeout: 150 }

env:
RGV: ..
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/install-rubygems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
fail-fast: false
matrix:
ruby:
- { name: "3.0", value: 3.0.6 }
- { name: "3.1", value: 3.1.4 }
- { name: "3.2", value: 3.2.3 }
- { name: "3.3", value: 3.3.0 }
- { name: jruby-9.4, value: jruby-9.4.2.0 }
- { name: truffleruby-23, value: truffleruby-23.1.2 }
- { name: "3.0", value: 3.0.7 }
- { name: "3.1", value: 3.1.5 }
- { name: "3.2", value: 3.2.4 }
- { name: "3.3", value: 3.3.1 }
- { name: jruby, value: jruby-9.4.6.0 }
- { name: truffleruby, value: truffleruby-24.0.1 }
openssl:
- { name: "openssl", value: true }
- { name: "no-openssl", value: false }
Expand Down Expand Up @@ -96,10 +96,10 @@ jobs:
fail-fast: false
matrix:
ruby:
- { name: "3.1", value: 3.1.4 } # Rails 7
- { name: "3.2", value: 3.2.3 } # Rails 7
- { name: "3.3", value: 3.3.0 } # Rails 7
- { name: jruby-9.4, value: jruby-9.4.2.0, rails-args: "--skip-webpack-install" } # Rails 6
- { name: "3.1", value: 3.1.5 } # Rails 7
- { name: "3.2", value: 3.2.4 } # Rails 7
- { name: "3.3", value: 3.3.1 } # Rails 7
- { name: jruby-9.4, value: jruby-9.4.6.0, rails-args: "--skip-webpack-install" } # Rails 6
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: Setup ruby
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/jruby-bundler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
with:
ruby-version: jruby-9.4.2.0
ruby-version: jruby-9.4.6.0
bundler: none
- name: Setup java
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/realworld-bundler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,20 @@ jobs:
- { name: Ubuntu, value: ubuntu-22.04 }

ruby:
- { name: ruby-3.0, value: 3.0.6 }
- { name: ruby-3.1, value: 3.1.4 }
- { name: ruby-3.2, value: 3.2.3 }
- { name: ruby-3.3, value: 3.3.0 }
- { name: ruby-3.0, value: 3.0.7 }
- { name: ruby-3.1, value: 3.1.5 }
- { name: ruby-3.2, value: 3.2.4 }
- { name: ruby-3.3, value: 3.3.1 }

bundler:
- { name: 2, value: '' }
- { name: 3, value: 3.0.0 }

include:
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 } }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 } }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.3 } }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0 } }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 } }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 } }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 } }
- { os: { name: macOS, value: macos-14 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 } }
env:
RGV: ..
RUBYOPT: --disable-gems
Expand Down Expand Up @@ -70,14 +70,14 @@ jobs:
fail-fast: false
matrix:
include:
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.3 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.6 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.4 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.3 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.0 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.7 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.5 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.4 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.1 } }
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: Setup ruby
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
with:
ruby-version: 3.3.0
ruby-version: 3.3.1
bundler: none
- name: Prepare dependencies
run: rake setup
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/rubygems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ jobs:
- { name: Windows, value: windows-2022 }

ruby:
- { name: "3.0", value: 3.0.6 }
- { name: "3.1", value: 3.1.4 }
- { name: "3.2", value: 3.2.3 }
- { name: "3.3", value: 3.3.0 }
- { name: "3.0", value: 3.0.7 }
- { name: "3.1", value: 3.1.5 }
- { name: "3.2", value: 3.2.4 }
- { name: "3.3", value: 3.3.1 }

include:
- ruby: { name: jruby-9.4, value: jruby-9.4.2.0 }
- ruby: { name: jruby, value: jruby-9.4.6.0 }
os: { name: Ubuntu, value: ubuntu-22.04 }

- ruby: { name: truffleruby-23, value: truffleruby-23.1.2 }
- ruby: { name: truffleruby, value: truffleruby-24.0.1 }
os: { name: Ubuntu, value: ubuntu-22.04 }

- os: { name: Windows, value: windows-2022 }
Expand All @@ -59,7 +59,7 @@ jobs:
run: rake setup
- name: Run Test
run: rake test
if: "!startsWith(matrix.ruby.name, 'truffleruby') && !startsWith(matrix.ruby.name, 'jruby')"
if: matrix.ruby.name != 'truffleruby' && matrix.ruby.name != 'jruby'
- name: Run Test isolatedly
run: rake test:isolated
if: matrix.ruby.name == '3.3' && matrix.os.name != 'Windows'
Expand All @@ -68,6 +68,6 @@ jobs:
if: startsWith(matrix.ruby.name, 'jruby')
- name: Run Test (Truffleruby)
run: TRUFFLERUBYOPT="--experimental-options --testing-rubygems" rake test
if: startsWith(matrix.ruby.name, 'truffleruby')
if: matrix.ruby.name == 'truffleruby'

timeout-minutes: 60
16 changes: 8 additions & 8 deletions .github/workflows/system-rubygems-bundler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ jobs:
fail-fast: false
matrix:
include:
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.3 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.6 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.4 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.3 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.0 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.7 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.5 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.4 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.1 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.7 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.5 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.4 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.3, value: 3.3.1 } }
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: Setup ruby
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/truffleruby-bundler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
with:
ruby-version: truffleruby-23.1.2
ruby-version: truffleruby-24.0.1
bundler: none
- name: Prepare dependencies
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # v1.175.1
with:
ruby-version: 3.3.0
ruby-version: 3.3.1
bundler: none
- name: Install Dependencies
run: rake setup
Expand Down

0 comments on commit a00987f

Please sign in to comment.