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.

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

Use latest patch level Ruby releases in CI #7036

Merged
merged 5 commits into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions .github/workflows/bundler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:

ruby:
- { name: ruby-2.6, value: 2.6.10 }
- { name: ruby-2.7, value: 2.7.7 }
- { name: ruby-3.0, value: 3.0.5 }
- { name: ruby-3.1, value: 3.1.3 }
- { name: ruby-3.2, value: 3.2.1 }
- { name: ruby-2.7, value: 2.7.8 }
- { name: ruby-3.0, value: 3.0.6 }
- { name: ruby-3.1, value: 3.1.4 }
- { name: ruby-3.2, value: 3.2.2 }

bundler:
- { name: 2, value: '' }
Expand All @@ -43,15 +43,15 @@ jobs:
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.6, value: 2.6.10 } }

include:
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.5 }, timeout: 90 }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.3 }, timeout: 90 }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.7 }, timeout: 90 }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.1 }, timeout: 90 }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 }, timeout: 90 }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 }, timeout: 90 }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.8 }, timeout: 90 }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.2 }, timeout: 90 }

- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.7 }, timeout: 150 }
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.5 }, timeout: 150 }
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.3 }, timeout: 150 }
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.1 }, timeout: 150 }
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.8 }, timeout: 150 }
- { 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.2 }, timeout: 150 }

env:
RGV: ..
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/install-rubygems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ jobs:
matrix:
ruby:
- { name: "2.6", value: 2.6.10 }
- { name: "2.7", value: 2.7.7 }
- { name: "3.0", value: 3.0.5 }
- { name: "3.1", value: 3.1.3 }
- { name: "3.2", value: 3.2.1 }
- { name: "2.7", value: 2.7.8 }
- { name: "3.0", value: 3.0.6 }
- { name: "3.1", value: 3.1.4 }
- { name: "3.2", value: 3.2.2 }
- { name: jruby-9.4, value: jruby-9.4.2.0 }
- { name: truffleruby-22, value: truffleruby-22.3.0 }
openssl:
Expand Down Expand Up @@ -97,8 +97,8 @@ jobs:
fail-fast: false
matrix:
ruby:
- { name: "3.1", value: 3.1.3 } # Rails 7
- { name: "3.2", value: 3.2.1 } # Rails 7
- { name: "3.1", value: 3.1.4 } # Rails 7
- { name: "3.2", value: 3.2.2 } # Rails 7
- { name: jruby-9.4, value: jruby-9.4.2.0, rails-args: "--skip-webpack-install" } # Rails 6
steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
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 @@ -26,10 +26,10 @@ jobs:

ruby:
- { name: ruby-2.6, value: 2.6.10 }
- { name: ruby-2.7, value: 2.7.7 }
- { name: ruby-3.0, value: 3.0.5 }
- { name: ruby-3.1, value: 3.1.3 }
- { name: ruby-3.2, value: 3.2.1 }
- { name: ruby-2.7, value: 2.7.8 }
- { name: ruby-3.0, value: 3.0.6 }
- { name: ruby-3.1, value: 3.1.4 }
- { name: ruby-3.2, value: 3.2.2 }

bundler:
- { name: 2, value: '' }
Expand All @@ -39,10 +39,10 @@ jobs:
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.6, value: 2.6.10 } }

include:
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.7 } }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.5 } }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.3 } }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.1 } }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.8 } }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 } }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 } }
- { os: { name: macOS, value: macos-12 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.2 } }
env:
RGV: ..
RUBYOPT: --disable-gems
Expand Down Expand Up @@ -75,14 +75,14 @@ jobs:
matrix:
include:
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.10 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.7 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.5 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.3 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.1 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.7 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.5 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.3 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.1 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.8 } }
- { 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.2 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.8 } }
- { 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.2 } }
steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Setup ruby
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Setup ruby
uses: ruby/setup-ruby@52b8784594ec115fd17094752708121dc5dabb47 # v1.154.0
with:
ruby-version: 3.2.1
ruby-version: 3.2.2
bundler: none
- name: Download all used cassettes as artifacts
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/rubygems.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ jobs:

ruby:
- { name: "2.6", value: 2.6.10 }
- { name: "2.7", value: 2.7.7 }
- { name: "3.0", value: 3.0.5 }
- { name: "3.1", value: 3.1.3 }
- { name: "3.2", value: 3.2.1 }
- { name: "2.7", value: 2.7.8 }
- { name: "3.0", value: 3.0.6 }
- { name: "3.1", value: 3.1.4 }
- { name: "3.2", value: 3.2.2 }

include:
- ruby: { name: "3.2", value: 3.2.1 }
- ruby: { name: "3.2", value: 3.2.2 }
os: { name: macOS, value: macos-12 }

- ruby: { name: jruby-9.4, value: jruby-9.4.2.0 }
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/system-rubygems-bundler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ jobs:
matrix:
include:
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.6, value: 2.6.10 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.7 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.5 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.3 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.1 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.7 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.0, value: 3.0.5 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.1, value: 3.1.3 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-3.2, value: 3.2.1 } }
- { bundler: { name: 2, value: '' }, ruby: { name: ruby-2.7, value: 2.7.8 } }
- { 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.2 } }
- { bundler: { name: 3, value: 3.0.0 }, ruby: { name: ruby-2.7, value: 2.7.8 } }
- { 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.2 } }
steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
- name: Setup ruby
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@52b8784594ec115fd17094752708121dc5dabb47 # v1.154.0
with:
ruby-version: 3.2.1
ruby-version: 3.2.2
bundler: none
- name: Install Dependencies
run: rake setup
Expand Down
1 change: 1 addition & 0 deletions bundler/spec/runtime/setup_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1339,6 +1339,7 @@ def lock_with(ruby_version = nil)
exempts = %w[did_you_mean bundler]
exempts << "uri" if Gem.ruby_version >= Gem::Version.new("2.7")
exempts << "pathname" if Gem.ruby_version >= Gem::Version.new("3.0")
exempts << "etc" if Gem.ruby_version < Gem::Version.new("3.2") && Gem.win_platform?
exempts << "set" unless Gem.rubygems_version >= Gem::Version.new("3.2.6")
exempts << "tsort" unless Gem.rubygems_version >= Gem::Version.new("3.2.31")
exempts << "error_highlight" # added in Ruby 3.1 as a default gem
Expand Down