From 2badf4b2c1584dd1155c3c223240750135c7c388 Mon Sep 17 00:00:00 2001 From: Jeff Widman Date: Thu, 28 Jul 2022 23:16:56 -0700 Subject: [PATCH] Bump Ruby to 3.1 This is necessary to unblock https://github.com/dependabot/dependabot-core/pull/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 https://github.com/dependabot/dependabot-core/pull/5030#issuecomment-1196371879 for the gory details. And besides, we want to move to Ruby 3.1 anyway... --- .github/ISSUE_TEMPLATE/bug-report.yml | 2 +- .ruby-version | 2 +- Dockerfile | 2 +- common/dependabot-common.gemspec | 2 +- common/spec/warning_monkey_patch.rb | 6 +++--- omnibus/dependabot-omnibus.gemspec | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index ce758c5173..d91c69064b 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -35,7 +35,7 @@ body: - type: input attributes: label: Language version - description: If applicable, specify the language version you're using (e.g., Node.js `14.1`, Ruby `2.7`, etc.) + description: If applicable, specify the language version you're using (e.g., Node.js `14.1`, Ruby `3.1`, etc.) validations: required: false diff --git a/.ruby-version b/.ruby-version index 49cdd668e1..ef538c2810 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.6 +3.1.2 diff --git a/Dockerfile b/Dockerfile index b68c489feb..1130ad7f04 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,7 +68,7 @@ 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.3.22 diff --git a/common/dependabot-common.gemspec b/common/dependabot-common.gemspec index 764900dcea..f852a84c94 100644 --- a/common/dependabot-common.gemspec +++ b/common/dependabot-common.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |spec| spec.require_path = "lib" spec.files = [] - spec.required_ruby_version = ">= 2.7.0" + spec.required_ruby_version = ">= 3.1.0" spec.required_rubygems_version = ">= 3.3.22" spec.add_dependency "activesupport", ">= 6.0.0" diff --git a/common/spec/warning_monkey_patch.rb b/common/spec/warning_monkey_patch.rb index 10af502fef..399c85568d 100644 --- a/common/spec/warning_monkey_patch.rb +++ b/common/spec/warning_monkey_patch.rb @@ -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 diff --git a/omnibus/dependabot-omnibus.gemspec b/omnibus/dependabot-omnibus.gemspec index 4e8ff643f5..23e4487c9c 100644 --- a/omnibus/dependabot-omnibus.gemspec +++ b/omnibus/dependabot-omnibus.gemspec @@ -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"]