Skip to content

dist-indexer: fix libuv version generation #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 2, 2018
Merged

dist-indexer: fix libuv version generation #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4e0a5b
dist-indexer: fix libuv version generation
maclover7 Aug 1, 2018
eceabd8
[squash!] fix indentation
maclover7 Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions dist-indexer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ const fs = require('fs')
`${githubContentUrl}/deps/uv/include/uv-version.h`
, `${githubContentUrl}/deps/uv/src/version.c`
, `${githubContentUrl}/deps/uv/include/uv.h`
, `${githubContentUrl}/deps/uv/include/uv/version.h`
]
, sslVersionUrl = [
`${githubContentUrl}/deps/openssl/openssl/include/openssl/opensslv.h`
Expand Down Expand Up @@ -161,7 +162,6 @@ function fetchV8Version (gitref, callback) {
})
}


function fetchUvVersion (gitref, callback) {
var version = cacheGet(gitref, 'uv')
if (version || (/\/v0\.([01234]\.\d+|5\.0)$/).test(gitref))
Expand Down Expand Up @@ -210,8 +210,25 @@ function fetchUvVersion (gitref, callback) {
.map(function (m) { return m[1] })
.join('.')

cachePut(gitref, 'uv', version)
callback(null, version)
if (version) {
cachePut(gitref, 'uv', version)
return callback(null, version)
}

fetch(uvVersionUrl[3], gitref, function (err, rawData) {
if (err)
return callback(err)

version = rawData.split('\n').map(function (line) {
return line.match(/^#define UV_VERSION_(?:MAJOR|MINOR|PATCH)\s+(\d+)$/)
})
.filter(Boolean)
.map(function (m) { return m[1] })
.join('.')

cachePut(gitref, 'uv', version)
callback(null, version)
})
})
})
})
Expand Down