From efda314f4a0ac38eea4136e25ce23f1822f51d19 Mon Sep 17 00:00:00 2001 From: Benoit Daloze Date: Sat, 7 Nov 2020 17:28:25 +0100 Subject: [PATCH] Remove Rubinius support * Fixes https://github.com/ruby/setup-ruby/issues/101 --- .github/workflows/test.yml | 1 - README.md | 3 --- dist/index.js | 15 +-------------- index.js | 2 -- ruby-builder-versions.js | 6 ------ ruby-builder.js | 7 +------ 6 files changed, 2 insertions(+), 32 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c3fbabc..a9d59ce 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,7 +19,6 @@ jobs: # Use various version syntax here for testing ruby: [ 2.1, 2.2, 2.3, 2.4, 2.5, 2.6.6, 2.7, ruby-head, debug, jruby-9.1, jruby, jruby-head, truffleruby, truffleruby-head ] include: - - { os: ubuntu-18.04, ruby: rubinius } - { os: windows-2016, ruby: mingw } - { os: windows-2019, ruby: mingw } - { os: windows-2019, ruby: mswin } diff --git a/README.md b/README.md index 70402bd..c163ebd 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,6 @@ This action currently supports these versions of MRI, JRuby and TruffleRuby: | Ruby | 2.1.9, 2.2, 2.3.0 - 2.3.8, 2.4.0 - 2.4.10, 2.5.0 - 2.5.8, 2.6.0 - 2.6.6, 2.7.2, head, debug, mingw, mswin | | JRuby | 9.1.17.0, 9.2.9.0 - 9.2.13.0, head | | TruffleRuby | 19.3.0 - 20.2.0, head | -| Rubinius | 4.14 | `ruby-debug` is the same as `ruby-head` but with assertions enabled (`-DRUBY_DEBUG=1`). On Windows, `mingw` and `mswin` are `ruby-head` builds using the MSYS2/MinGW and the MSVC toolchains respectively. @@ -40,8 +39,6 @@ The action works for all [GitHub-hosted runners](https://help.github.com/en/acti | macOS | `macos-latest` (= `macos-10.15`) | | | Windows | `windows-latest` (= `windows-2019`) | `windows-2016` | -Rubinius is only available on `ubuntu-18.04`. - The prebuilt releases are generated by [ruby-builder](https://github.com/ruby/ruby-builder) and on Windows by [RubyInstaller2](https://github.com/oneclick/rubyinstaller2). `mingw` and `mswin` builds are generated by [ruby-loco](https://github.com/MSP-Greg/ruby-loco). diff --git a/dist/index.js b/dist/index.js index e8826ff..d33bd98 100644 --- a/dist/index.js +++ b/dist/index.js @@ -44499,12 +44499,6 @@ function getVersions(platform) { ] } - if (platform === 'ubuntu-18.04') { - versions['rubinius'] = [ - "4.14" - ] - } - return versions } @@ -51349,8 +51343,6 @@ async function installBundler(bundlerVersionInput, lockFile, platform, rubyPrefi console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`) } else if (engine === 'truffleruby' && bundlerVersion === '1') { console.log(`Using Bundler 1 shipped with ${engine}`) - } else if (engine === 'rubinius') { - console.log(`Rubinius only supports the version of Bundler shipped with it`) } else { const gem = path.join(rubyPrefix, 'bin', 'gem') await exec.exec(gem, ['install', 'bundler', '-v', `~> ${bundlerVersion}`, '--no-document']) @@ -52886,12 +52878,7 @@ async function downloadAndExtract(platform, engine, version) { const rubyPrefix = path.join(rubiesDir, `${engine}-${version}`) // Set the PATH now, so the MSYS2 'tar' is in Path on Windows - if (engine === 'rubinius') { - core.warning('Rubinius builds will no longer be provided, see https://github.com/ruby/setup-ruby/issues/101') - common.setupPath([path.join(rubyPrefix, 'bin'), path.join(rubyPrefix, 'gems', 'bin')]) - } else { - common.setupPath([path.join(rubyPrefix, 'bin')]) - } + common.setupPath([path.join(rubyPrefix, 'bin')]) await io.mkdirP(rubiesDir) diff --git a/index.js b/index.js index 2d89d5f..fa125b2 100644 --- a/index.js +++ b/index.js @@ -227,8 +227,6 @@ async function installBundler(bundlerVersionInput, lockFile, platform, rubyPrefi console.log(`Using Bundler 2 shipped with ${engine}-${rubyVersion}`) } else if (engine === 'truffleruby' && bundlerVersion === '1') { console.log(`Using Bundler 1 shipped with ${engine}`) - } else if (engine === 'rubinius') { - console.log(`Rubinius only supports the version of Bundler shipped with it`) } else { const gem = path.join(rubyPrefix, 'bin', 'gem') await exec.exec(gem, ['install', 'bundler', '-v', `~> ${bundlerVersion}`, '--no-document']) diff --git a/ruby-builder-versions.js b/ruby-builder-versions.js index eedf57d..c819d6c 100644 --- a/ruby-builder-versions.js +++ b/ruby-builder-versions.js @@ -22,11 +22,5 @@ export function getVersions(platform) { ] } - if (platform === 'ubuntu-18.04') { - versions['rubinius'] = [ - "4.14" - ] - } - return versions } diff --git a/ruby-builder.js b/ruby-builder.js index ae987b1..79ce27f 100644 --- a/ruby-builder.js +++ b/ruby-builder.js @@ -26,12 +26,7 @@ async function downloadAndExtract(platform, engine, version) { const rubyPrefix = path.join(rubiesDir, `${engine}-${version}`) // Set the PATH now, so the MSYS2 'tar' is in Path on Windows - if (engine === 'rubinius') { - core.warning('Rubinius builds will no longer be provided, see https://github.com/ruby/setup-ruby/issues/101') - common.setupPath([path.join(rubyPrefix, 'bin'), path.join(rubyPrefix, 'gems', 'bin')]) - } else { - common.setupPath([path.join(rubyPrefix, 'bin')]) - } + common.setupPath([path.join(rubyPrefix, 'bin')]) await io.mkdirP(rubiesDir)