Skip to content

Commit 77ca66c

Browse files
committed
Add 2.0.0 on Windows too
1 parent fd1a6a0 commit 77ca66c

5 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/test.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,9 @@ jobs:
2222
- { os: windows-2019, ruby: mingw }
2323
- { os: windows-2019, ruby: mswin }
2424
exclude:
25-
- { os: windows-2016, ruby: '2.0' }
2625
- { os: windows-2016, ruby: debug }
2726
- { os: windows-2016, ruby: truffleruby }
2827
- { os: windows-2016, ruby: truffleruby-head }
29-
- { os: windows-2019, ruby: '2.0' }
3028
- { os: windows-2019, ruby: debug }
3129
- { os: windows-2019, ruby: truffleruby }
3230
- { os: windows-2019, ruby: truffleruby-head }

dist/index.js

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

generate-windows-versions.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
require 'yaml'
33
require 'json'
44

5-
min_requirements = ['~> 2.1.9', '>= 2.2.6'].map { |req| Gem::Requirement.new(req) }
5+
min_requirements = ['~> 2.0.0', '~> 2.1.9', '>= 2.2.6'].map { |req| Gem::Requirement.new(req) }
66

77
url = 'https://raw.githubusercontent.com/oneclick/rubyinstaller.org-website/master/_data/downloads.yaml'
88
entries = YAML.load(Net::HTTP.get(URI(url)), symbolize_names: true)

windows-versions.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

windows.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ const rubyInstallerVersions = require('./windows-versions').versions
1313

1414
const drive = common.drive
1515

16-
// needed for 2.1, 2.2, 2.3, and mswin, cert file used by Git for Windows
16+
// needed for 2.0-2.3, and mswin, cert file used by Git for Windows
1717
const certFile = 'C:\\Program Files\\Git\\mingw64\\ssl\\cert.pem'
1818

19-
// location & path for old RubyInstaller DevKit (MSYS), Ruby 2.1, 2.2 and 2.3
19+
// location & path for old RubyInstaller DevKit (MSYS), Ruby 2.0-2.3
2020
const msys = `${drive}:\\DevKit64`
2121
const msysPathEntries = [`${msys}\\mingw\\x86_64-w64-mingw32\\bin`, `${msys}\\mingw\\bin`, `${msys}\\bin`]
2222

@@ -82,7 +82,7 @@ async function downloadAndExtract(engine, version, url, base, rubyPrefix) {
8282
async function setupMingw(version) {
8383
core.exportVariable('MAKE', 'make.exe')
8484

85-
if (version.match(/^2\.[123]/)) {
85+
if (version.match(/^2\.[0123]/)) {
8686
core.exportVariable('SSL_CERT_FILE', certFile)
8787
await common.measure('Installing MSYS', async () => installMSYS(version))
8888
return msysPathEntries
@@ -91,7 +91,7 @@ async function setupMingw(version) {
9191
}
9292
}
9393

94-
// Ruby 2.1, 2.2 and 2.3
94+
// Ruby 2.0, 2.1, 2.2 and 2.3
9595
async function installMSYS(version) {
9696
const url = 'https://github.com/oneclick/rubyinstaller/releases/download/devkit-4.7.2/DevKit-mingw64-64-4.7.2-20130224-1432-sfx.exe'
9797
const downloadPath = await tc.downloadTool(url)

0 commit comments

Comments
 (0)