Skip to content

Commit

Permalink
Bump Ruby to 3.1
Browse files Browse the repository at this point in the history
This is necessary to unblock
dependabot#5030, because Ubuntu
`22.04` doesn't provide an older version of `openssl`, so need a new
enough Ruby to work with the newer version of `openssl`.
See dependabot#5030 (comment)
for the gory details.

And besides, we want to move to Ruby 3.1 anyway...

This also bumps RubyGems because Ruby 3.1 requires a newer version of RubyGems:

```
 ERROR:  rubygems 3.2.20 is not supported on 3.1.2. The oldest version supported by this ruby is 3.3.3
 ```

So I bumped to the newest release in the `3.3.x` series.
  • Loading branch information
jeffwidman committed Aug 8, 2022
1 parent 0e56145 commit dbea81c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ assignees: ''
**Package manager version**
<!-- If applicable, specify the package manager version you're using (e.g., npm 7.1, pip-compile 5.0, etc.) -->
**Language version**
<!-- If applicable, specify the language version you're using (e.g., node 14.1, Ruby 2.7, etc. ) -->
<!-- If applicable, specify the language version you're using (e.g., node 14.1, Ruby 3.1, etc. ) -->
**Manifest location and content before the Dependabot update**
<!-- If applicable, specify the path to each manifest file (/client/package.json, /Gemfile, etc.) -->
<!-- If applicable, attach each manifest file or provide a link to each manifest file -->
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.6
3.1.2
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ RUN if ! getent group "$USER_GID"; then groupadd --gid "$USER_GID" dependabot ;

### RUBY

ARG RUBY_VERSION=2.7.6
ARG RUBY_VERSION=3.1.2
ARG RUBY_INSTALL_VERSION=0.8.3

ARG RUBYGEMS_SYSTEM_VERSION=3.2.20
ARG RUBYGEMS_SYSTEM_VERSION=3.3.19
# Disable the outdated rubygems installation from being loaded
ENV DEBIAN_DISABLE_RUBYGEMS_INTEGRATION=true

Expand Down
4 changes: 2 additions & 2 deletions common/dependabot-common.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
spec.require_path = "lib"
spec.files = []

spec.required_ruby_version = ">= 2.7.0"
spec.required_rubygems_version = ">= 2.7.3"
spec.required_ruby_version = ">= 3.1.0"
spec.required_rubygems_version = ">= 3.3.3"

spec.add_dependency "activesupport", ">= 6.0.0"
spec.add_dependency "aws-sdk-codecommit", "~> 1.28"
Expand Down
6 changes: 3 additions & 3 deletions common/spec/warning_monkey_patch.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# frozen_string_literal: true

ALLOW_PATTERNS = [
# Ignore parser warnings for ruby 2.7 minor version mismatches.
# Ignore `parser/current` warnings for ruby patch version mismatches.
# This is a recurring issue that occurs whenever the parser gets
# ahead of our installed ruby version.
%r{parser/current is loading parser/ruby27},
/2.7.\d-compliant syntax, but you are running 2.7.\d/,
%r{parser/current is loading parser/ruby31},
/3.1.\d-compliant syntax, but you are running 3.1.\d/,
%r{whitequark/parser}
].freeze

Expand Down
2 changes: 1 addition & 1 deletion omnibus/dependabot-omnibus.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
spec.homepage = common_gemspec.homepage
spec.license = common_gemspec.license

spec.required_ruby_version = ">= 2.7.0"
spec.required_ruby_version = ">= 3.1.0"
spec.require_path = "lib"
spec.files = ["lib/dependabot/omnibus.rb"]

Expand Down

0 comments on commit dbea81c

Please sign in to comment.