Remove unused Node binary publishing, and upgrade build environment.
Upgrades the build environment to Node 10, which let's us pull down some security fixes in package dependencies that were unfixed in Node 4. Also removes Node 4 and 6 binary publishing which were almost never used (20 downloads out of 50,000). Fixes https://github.com/Project-OSRM/osrm-backend/issues/5312
This commit is contained in:
parent
1ef85c57cc
commit
717406043a
4
.gitignore
vendored
4
.gitignore
vendored
@ -68,6 +68,10 @@ Thumbs.db
|
|||||||
/*.local.bat
|
/*.local.bat
|
||||||
/CMakeSettings.json
|
/CMakeSettings.json
|
||||||
|
|
||||||
|
# Jetbrains related files #
|
||||||
|
###########################
|
||||||
|
.idea/
|
||||||
|
|
||||||
# stxxl related files #
|
# stxxl related files #
|
||||||
#######################
|
#######################
|
||||||
.stxxl
|
.stxxl
|
||||||
|
@ -54,7 +54,6 @@ matrix:
|
|||||||
- nvm use $NODE
|
- nvm use $NODE
|
||||||
- npm --version
|
- npm --version
|
||||||
- npm ci --ignore-scripts
|
- npm ci --ignore-scripts
|
||||||
- npm link --ignore-scripts
|
|
||||||
script:
|
script:
|
||||||
- ./scripts/check_taginfo.py taginfo.json profiles/car.lua
|
- ./scripts/check_taginfo.py taginfo.json profiles/car.lua
|
||||||
- ${MASON} install clang-format 3.8.1
|
- ${MASON} install clang-format 3.8.1
|
||||||
|
@ -295,7 +295,7 @@ module.exports = function () {
|
|||||||
this.reprocess(callback);
|
this.reprocess(callback);
|
||||||
});
|
});
|
||||||
|
|
||||||
this.Given(/^osrm\-routed is stopped$/, (callback) => {
|
this.Given(/^osrm-routed is stopped$/, (callback) => {
|
||||||
this.OSRMLoader.shutdown(callback);
|
this.OSRMLoader.shutdown(callback);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -21,11 +21,11 @@ module.exports = function () {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
this.When(/^I run "osrm\-routed\s?(.*?)"$/, { timeout: this.TIMEOUT }, (options, callback) => {
|
this.When(/^I run "osrm-routed\s?(.*?)"$/, { timeout: this.TIMEOUT }, (options, callback) => {
|
||||||
this.runAndSafeOutput('osrm-routed', options, callback);
|
this.runAndSafeOutput('osrm-routed', options, callback);
|
||||||
});
|
});
|
||||||
|
|
||||||
this.When(/^I run "osrm\-(extract|contract|partition|customize)\s?(.*?)"$/, (binary, options, callback) => {
|
this.When(/^I run "osrm-(extract|contract|partition|customize)\s?(.*?)"$/, (binary, options, callback) => {
|
||||||
const stamp = this.processedCacheFile + '.stamp_' + binary;
|
const stamp = this.processedCacheFile + '.stamp_' + binary;
|
||||||
this.runAndSafeOutput('osrm-' + binary, options, (err) => {
|
this.runAndSafeOutput('osrm-' + binary, options, (err) => {
|
||||||
if (err) return callback(err);
|
if (err) return callback(err);
|
||||||
@ -33,11 +33,11 @@ module.exports = function () {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
this.When(/^I try to run "(osrm\-[a-z]+)\s?(.*?)"$/, (binary, options, callback) => {
|
this.When(/^I try to run "(osrm-[a-z]+)\s?(.*?)"$/, (binary, options, callback) => {
|
||||||
this.runAndSafeOutput(binary, options, () => { callback(); });
|
this.runAndSafeOutput(binary, options, () => { callback(); });
|
||||||
});
|
});
|
||||||
|
|
||||||
this.When(/^I run "osrm\-datastore\s?(.*?)"(?: with input "([^"]*)")?$/, (options, input, callback) => {
|
this.When(/^I run "osrm-datastore\s?(.*?)"(?: with input "([^"]*)")?$/, (options, input, callback) => {
|
||||||
let child = this.runAndSafeOutput('osrm-datastore', options, callback);
|
let child = this.runAndSafeOutput('osrm-datastore', options, callback);
|
||||||
if (input !== undefined)
|
if (input !== undefined)
|
||||||
child.stdin.write(input);
|
child.stdin.write(input);
|
||||||
|
@ -69,7 +69,7 @@ module.exports = function () {
|
|||||||
outputRow[direction] = result[direction].status ?
|
outputRow[direction] = result[direction].status ?
|
||||||
'x' : '';
|
'x' : '';
|
||||||
break;
|
break;
|
||||||
case /^[\d\.]+ s/.test(want):
|
case /^[\d.]+ s/.test(want):
|
||||||
// the result here can come back as a non-number value like
|
// the result here can come back as a non-number value like
|
||||||
// `diff`, but we only want to apply the unit when it comes
|
// `diff`, but we only want to apply the unit when it comes
|
||||||
// back as a number, for tableDiff's literal comparison
|
// back as a number, for tableDiff's literal comparison
|
||||||
|
@ -145,7 +145,7 @@ module.exports = function() {
|
|||||||
|
|
||||||
// converts the scenario titles in file prefixes
|
// converts the scenario titles in file prefixes
|
||||||
this.getScenarioID = (scenario) => {
|
this.getScenarioID = (scenario) => {
|
||||||
let name = scenario.getName().toLowerCase().replace(/[\/\-'=,\(\):\*#]/g, '')
|
let name = scenario.getName().toLowerCase().replace(/[/\-'=,():*#]/g, '')
|
||||||
.replace(/\s/g, '_').replace(/__/g, '_').replace(/\.\./g, '.')
|
.replace(/\s/g, '_').replace(/__/g, '_').replace(/\.\./g, '.')
|
||||||
.substring(0, 64);
|
.substring(0, 64);
|
||||||
return util.format('%d_%s', scenario.getLine(), name);
|
return util.format('%d_%s', scenario.getLine(), name);
|
||||||
|
@ -17,12 +17,12 @@ module.exports = {
|
|||||||
return true;
|
return true;
|
||||||
|
|
||||||
var matchPercent = want.match(/(.*)\s+~(.+)%$/),
|
var matchPercent = want.match(/(.*)\s+~(.+)%$/),
|
||||||
matchAbs = want.match(/(.*)\s+\+\-(.+)$/),
|
matchAbs = want.match(/(.*)\s+\+-(.+)$/),
|
||||||
matchRe = want.match(/^\/(.*)\/$/),
|
matchRe = want.match(/^\/(.*)\/$/),
|
||||||
// we use this for matching before/after bearing
|
// we use this for matching before/after bearing
|
||||||
matchBearingListAbs = want.match(/^((\d+)->(\d+))(,(\d+)->(\d+))*\s+\+\-(.+)$/),
|
matchBearingListAbs = want.match(/^((\d+)->(\d+))(,(\d+)->(\d+))*\s+\+-(.+)$/),
|
||||||
matchIntersectionListAbs = want.match(/^(((((true|false):\d+)\s{0,1})+,{0,1})+;{0,1})+\s+\+\-(.+)$/),
|
matchIntersectionListAbs = want.match(/^(((((true|false):\d+)\s{0,1})+,{0,1})+;{0,1})+\s+\+-(.+)$/),
|
||||||
matchRangeNumbers = want.match(/\d+\+\-\d+/);
|
matchRangeNumbers = want.match(/\d+\+-\d+/);
|
||||||
|
|
||||||
function inRange(margin, got, want) {
|
function inRange(margin, got, want) {
|
||||||
var fromR = parseFloat(want) - margin,
|
var fromR = parseFloat(want) - margin,
|
||||||
|
@ -115,7 +115,7 @@ module.exports = function () {
|
|||||||
|
|
||||||
if (headers.has('weight')) {
|
if (headers.has('weight')) {
|
||||||
if (row.weight.length) {
|
if (row.weight.length) {
|
||||||
if (!row.weight.match(/[\d\.]+/))
|
if (!row.weight.match(/[\d.]+/))
|
||||||
return cb(new Error('*** Weight must be specified as a numeric value. (ex: 8)'));
|
return cb(new Error('*** Weight must be specified as a numeric value. (ex: 8)'));
|
||||||
got.weight = instructions ? util.format('%d', weight) : '';
|
got.weight = instructions ? util.format('%d', weight) : '';
|
||||||
} else {
|
} else {
|
||||||
|
5990
package-lock.json
generated
5990
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -7,7 +7,7 @@
|
|||||||
"mkdirp": "^0.5.1",
|
"mkdirp": "^0.5.1",
|
||||||
"nan": "^2.11.1",
|
"nan": "^2.11.1",
|
||||||
"node-cmake": "^2.3.2",
|
"node-cmake": "^2.3.2",
|
||||||
"node-pre-gyp": "^0.6.36",
|
"node-pre-gyp": "^0.12.0",
|
||||||
"rimraf": "^2.5.4"
|
"rimraf": "^2.5.4"
|
||||||
},
|
},
|
||||||
"browserify": {
|
"browserify": {
|
||||||
@ -47,14 +47,14 @@
|
|||||||
"csv-stringify": "^3.0.0",
|
"csv-stringify": "^3.0.0",
|
||||||
"cucumber": "^1.2.1",
|
"cucumber": "^1.2.1",
|
||||||
"d3-queue": "^2.0.3",
|
"d3-queue": "^2.0.3",
|
||||||
"docbox": "^1.0.6",
|
"docbox": "^1.0.11",
|
||||||
"documentation": "^4.0.0-rc.1",
|
"documentation": "^4.0.0-rc.1",
|
||||||
"eslint": "^2.4.0",
|
"eslint": "^5.10.0",
|
||||||
"faucet": "^0.0.1",
|
"faucet": "^0.0.1",
|
||||||
"jsonpath": "^1.0.0",
|
"jsonpath": "^1.0.0",
|
||||||
"node-timeout": "0.0.4",
|
"node-timeout": "0.0.4",
|
||||||
"polyline": "^0.2.0",
|
"polyline": "^0.2.0",
|
||||||
"request": "^2.69.0",
|
"request": "^2.88.0",
|
||||||
"tape": "^4.7.0",
|
"tape": "^4.7.0",
|
||||||
"turf": "^3.0.14",
|
"turf": "^3.0.14",
|
||||||
"xmlbuilder": "^4.2.1"
|
"xmlbuilder": "^4.2.1"
|
||||||
|
Loading…
Reference in New Issue
Block a user