diff --git a/packages/ruby/install-ruby.ts b/packages/ruby/install-ruby.ts index c5158c4d5..7af1cb2ab 100644 --- a/packages/ruby/install-ruby.ts +++ b/packages/ruby/install-ruby.ts @@ -5,13 +5,15 @@ import { Meta, NodeVersion, debug, NowBuildError } from '@vercel/build-utils'; interface RubyVersion extends NodeVersion { minor: number; + patch: number; } const allOptions: RubyVersion[] = [ - { major: 2, minor: 7, range: '2.7.x', runtime: 'ruby2.7' }, + { major: 2, minor: 7, patch: 0, range: '2.7.x', runtime: 'ruby2.7' }, { major: 2, minor: 5, + patch: 0, range: '2.5.x', runtime: 'ruby2.5', discontinueDate: new Date('2021-11-30'), @@ -55,7 +57,7 @@ function getRubyPath(meta: Meta, gemfileContents: string) { if (isDiscontinued(selection)) { const latest = getLatestRubyVersion(); const intro = `Found \`Gemfile\` with discontinued Ruby version: \`${line}.\``; - const hint = `Please set \`ruby "~> ${latest.range}"\` in your \`Gemfile\` to use Ruby ${latest.range}.`; + const hint = `Please set \`ruby "~> ${latest.major}.${latest.minor}.${latest.patch}"\` in your \`Gemfile\` to use the latest Ruby version.`; throw new NowBuildError({ code: 'RUBY_DISCONTINUED_VERSION', link: 'http://vercel.link/ruby-version', diff --git a/packages/ruby/test/fixtures/11-version-2-5-error/Gemfile b/packages/ruby/test/fixtures/11-version-2-5-error/Gemfile index 886fc6053..4ae28605a 100644 --- a/packages/ruby/test/fixtures/11-version-2-5-error/Gemfile +++ b/packages/ruby/test/fixtures/11-version-2-5-error/Gemfile @@ -2,6 +2,6 @@ source "https://rubygems.org" -ruby "~> 2.5.x" +ruby "~> 2.5.0" gem "cowsay", "~> 0.3.0" diff --git a/packages/ruby/test/test.js b/packages/ruby/test/test.js index 43a986bf1..98eb55412 100644 --- a/packages/ruby/test/test.js +++ b/packages/ruby/test/test.js @@ -12,7 +12,7 @@ const fixturesPath = path.resolve(__dirname, 'fixtures'); const testsThatFailToBuild = new Map([ [ '11-version-2-5-error', - 'Found `Gemfile` with discontinued Ruby version: `ruby "~> 2.5.x".` Please set `ruby "~> 2.7.x"` in your `Gemfile` to use Ruby 2.7.x.', + 'Found `Gemfile` with discontinued Ruby version: `ruby "~> 2.5.0".` Please set `ruby "~> 2.7.0"` in your `Gemfile` to use the latest Ruby version.', ], ]);