diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82b07a5..61aac03 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -22,11 +22,9 @@ jobs: - { os: windows-2019, ruby: mingw } - { os: windows-2019, ruby: mswin } exclude: - - { os: windows-2016, ruby: '2.0' } - { os: windows-2016, ruby: debug } - { os: windows-2016, ruby: truffleruby } - { os: windows-2016, ruby: truffleruby-head } - - { os: windows-2019, ruby: '2.0' } - { os: windows-2019, ruby: debug } - { os: windows-2019, ruby: truffleruby } - { os: windows-2019, ruby: truffleruby-head } diff --git a/dist/index.js b/dist/index.js index 8247519..3c46c48 100644 --- a/dist/index.js +++ b/dist/index.js @@ -27753,10 +27753,10 @@ const rubyInstallerVersions = __webpack_require__(223).versions const drive = common.drive -// needed for 2.1, 2.2, 2.3, and mswin, cert file used by Git for Windows +// needed for 2.0-2.3, and mswin, cert file used by Git for Windows const certFile = 'C:\\Program Files\\Git\\mingw64\\ssl\\cert.pem' -// location & path for old RubyInstaller DevKit (MSYS), Ruby 2.1, 2.2 and 2.3 +// location & path for old RubyInstaller DevKit (MSYS), Ruby 2.0-2.3 const msys = `${drive}:\\DevKit64` const msysPathEntries = [`${msys}\\mingw\\x86_64-w64-mingw32\\bin`, `${msys}\\mingw\\bin`, `${msys}\\bin`] @@ -27822,7 +27822,7 @@ async function downloadAndExtract(engine, version, url, base, rubyPrefix) { async function setupMingw(version) { core.exportVariable('MAKE', 'make.exe') - if (version.match(/^2\.[123]/)) { + if (version.match(/^2\.[0123]/)) { core.exportVariable('SSL_CERT_FILE', certFile) await common.measure('Installing MSYS', async () => installMSYS(version)) return msysPathEntries @@ -27831,7 +27831,7 @@ async function setupMingw(version) { } } -// Ruby 2.1, 2.2 and 2.3 +// Ruby 2.0, 2.1, 2.2 and 2.3 async function installMSYS(version) { const url = 'https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe' const downloadPath = await tc.downloadTool(url) @@ -28202,6 +28202,7 @@ exports.debug = debug; // for test __webpack_require__.r(__webpack_exports__); /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "versions", function() { return versions; }); const versions = { + "2.0.0": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.0.0-p648/ruby-2.0.0-p648-x64-mingw32.7z", "2.1.9": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.1.9/ruby-2.1.9-x64-mingw32.7z", "2.2.6": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.2.6/ruby-2.2.6-x64-mingw32.7z", "2.3.0": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.3.0/ruby-2.3.0-x64-mingw32.7z", diff --git a/generate-windows-versions.rb b/generate-windows-versions.rb index 3d38461..d0b9cd2 100644 --- a/generate-windows-versions.rb +++ b/generate-windows-versions.rb @@ -2,7 +2,7 @@ require 'net/http' require 'yaml' require 'json' -min_requirements = ['~> 2.1.9', '>= 2.2.6'].map { |req| Gem::Requirement.new(req) } +min_requirements = ['~> 2.0.0', '~> 2.1.9', '>= 2.2.6'].map { |req| Gem::Requirement.new(req) } url = 'https://raw.githubusercontent.com/oneclick/rubyinstaller.org-website/master/_data/downloads.yaml' entries = YAML.load(Net::HTTP.get(URI(url)), symbolize_names: true) diff --git a/windows-versions.js b/windows-versions.js index 3631637..c7c8c89 100644 --- a/windows-versions.js +++ b/windows-versions.js @@ -1,4 +1,5 @@ export const versions = { + "2.0.0": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.0.0-p648/ruby-2.0.0-p648-x64-mingw32.7z", "2.1.9": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.1.9/ruby-2.1.9-x64-mingw32.7z", "2.2.6": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.2.6/ruby-2.2.6-x64-mingw32.7z", "2.3.0": "https://github.com/oneclick/rubyinstaller/releases/download/ruby-2.3.0/ruby-2.3.0-x64-mingw32.7z", diff --git a/windows.js b/windows.js index a7e6615..e88411f 100644 --- a/windows.js +++ b/windows.js @@ -13,10 +13,10 @@ const rubyInstallerVersions = require('./windows-versions').versions const drive = common.drive -// needed for 2.1, 2.2, 2.3, and mswin, cert file used by Git for Windows +// needed for 2.0-2.3, and mswin, cert file used by Git for Windows const certFile = 'C:\\Program Files\\Git\\mingw64\\ssl\\cert.pem' -// location & path for old RubyInstaller DevKit (MSYS), Ruby 2.1, 2.2 and 2.3 +// location & path for old RubyInstaller DevKit (MSYS), Ruby 2.0-2.3 const msys = `${drive}:\\DevKit64` const msysPathEntries = [`${msys}\\mingw\\x86_64-w64-mingw32\\bin`, `${msys}\\mingw\\bin`, `${msys}\\bin`] @@ -82,7 +82,7 @@ async function downloadAndExtract(engine, version, url, base, rubyPrefix) { async function setupMingw(version) { core.exportVariable('MAKE', 'make.exe') - if (version.match(/^2\.[123]/)) { + if (version.match(/^2\.[0123]/)) { core.exportVariable('SSL_CERT_FILE', certFile) await common.measure('Installing MSYS', async () => installMSYS(version)) return msysPathEntries @@ -91,7 +91,7 @@ async function setupMingw(version) { } } -// Ruby 2.1, 2.2 and 2.3 +// Ruby 2.0, 2.1, 2.2 and 2.3 async function installMSYS(version) { const url = 'https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe' const downloadPath = await tc.downloadTool(url)