diff options
| author | Rod Vagg <rod@vagg.org> | 2015-07-13 06:35:02 +0300 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2015-07-22 14:01:59 +0300 |
| commit | 78b4a07085c0ba32b3c22966d70e47371c99b40c (patch) | |
| tree | f1e46b3cb4bb37f3efc389797da481a6707b9609 | |
| parent | 62eeeb0f45656b4edaffebdbb0a1c458aac205e4 (diff) | |
node-gyp: detect RC build with x.y.z-rc.n formatv3.0.0-rc.4
PR-URL: https://github.com/nodejs/io.js/pull/2171
Reviewed-By: Alexis Campailla <alexis@janeasystems.com>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
| -rw-r--r-- | deps/npm/node_modules/node-gyp/lib/install.js | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/deps/npm/node_modules/node-gyp/lib/install.js b/deps/npm/node_modules/node-gyp/lib/install.js index cecd7fd4af4..c221a4d50b0 100644 --- a/deps/npm/node_modules/node-gyp/lib/install.js +++ b/deps/npm/node_modules/node-gyp/lib/install.js @@ -460,7 +460,7 @@ function install (gyp, argv, callback) { // pick out 'nightly', 'next-nightly' or 'rc' from the version string if it's there // adjust URL accordingly function getDefaultIojsUrl(version) { - var versionMatch = version.match(/^v\d+\.\d+\.\d+-(?:(?:(nightly|next-nightly)\d{8}[0-9a-f]{10})|(?:(rc)\d+))$/) + var versionMatch = version.match(/^v\d+\.\d+\.\d+-(?:(?:(nightly|next-nightly)\.?\d{8}[0-9a-f]{10})|(?:(rc)\.\d+))$/) var distType = versionMatch ? versionMatch[1] || versionMatch[2] : 'release' var defaultUrl = `https://iojs.org/download/${distType}` return defaultUrl @@ -470,11 +470,15 @@ function getDefaultIojsUrl(version) { if (require.main === module) { var assert = require('assert') console.log('test v2.3.4 -> https://iojs.org/download/release') - assert(getDefaultIojsUrl('v2.3.4', 'https://iojs.org/download/release')) + assert.equal(getDefaultIojsUrl('v2.3.4'), 'https://iojs.org/download/release') console.log('test v2.3.4-nightly12345678aaaaaaaaaa -> https://iojs.org/download/nightly') - assert(getDefaultIojsUrl('v2.3.4-nightly12345678aaaaaaaaaa', 'https://iojs.org/download/nightly')) + assert.equal(getDefaultIojsUrl('v2.3.4-nightly12345678aaaaaaaaaa'), 'https://iojs.org/download/nightly') + console.log('test v2.3.4-nightly.12345678aaaaaaaaaa -> https://iojs.org/download/nightly') + assert.equal(getDefaultIojsUrl('v2.3.4-nightly.12345678aaaaaaaaaa'), 'https://iojs.org/download/nightly') console.log('test v2.3.4-next-nightly12345678aaaaaaaaaa -> https://iojs.org/download/release/next-nightly') - assert(getDefaultIojsUrl('v2.3.4-next-nightly12345678aaaaaaaaaa', 'https://iojs.org/download/next-nightly')) - console.log('test v2.3.4-rc100 -> https://iojs.org/download/rc') - assert(getDefaultIojsUrl('v2.3.4-rc100', 'https://iojs.org/download/rc')) + assert.equal(getDefaultIojsUrl('v2.3.4-next-nightly12345678aaaaaaaaaa'), 'https://iojs.org/download/next-nightly') + console.log('test v2.3.4-next-nightly.12345678aaaaaaaaaa -> https://iojs.org/download/release/next-nightly') + assert.equal(getDefaultIojsUrl('v2.3.4-next-nightly.12345678aaaaaaaaaa'), 'https://iojs.org/download/next-nightly') + console.log('test v2.3.4-rc.100 -> https://iojs.org/download/rc') + assert.equal(getDefaultIojsUrl('v2.3.4-rc.100'), 'https://iojs.org/download/rc') } |