mirror of
https://github.com/knex/knex.git
synced 2025-06-26 22:00:25 +00:00
Migrate Jake to 10.8.5 (#5138)
This commit is contained in:
parent
b8fc16f867
commit
d6b97d5b83
@ -114,7 +114,7 @@
|
||||
"eslint-plugin-import": "^2.26.0",
|
||||
"eslint-plugin-mocha-no-only": "^1.1.1",
|
||||
"husky": "^7.0.4",
|
||||
"jake": "^8.1.1",
|
||||
"jake": "^10.8.5",
|
||||
"JSONStream": "^1.3.5",
|
||||
"lint-staged": "^12.3.7",
|
||||
"mocha": "^9.2.2",
|
||||
|
@ -2,6 +2,7 @@
|
||||
|
||||
const os = require('os');
|
||||
const fs = require('fs');
|
||||
const child_process = require("child_process");
|
||||
const rimrafSync = require('rimraf').sync;
|
||||
|
||||
function assertExec(cmd, desc) {
|
||||
@ -9,15 +10,13 @@ function assertExec(cmd, desc) {
|
||||
return new Promise((resolve, reject) => {
|
||||
let stderr = '';
|
||||
let stdout = '';
|
||||
// console.log(`Executing: ${cmd}`);
|
||||
const bin = jake.createExec([cmd]);
|
||||
bin.addListener('error', (msg, code) =>
|
||||
const bin = child_process.exec(cmd);
|
||||
bin.on('error', (msg, code) =>
|
||||
reject(Error(desc + ' FAIL. ' + stderr))
|
||||
);
|
||||
bin.addListener('cmdEnd', (cmd) => resolve({ cmd, stdout, stderr }));
|
||||
bin.addListener('stdout', (data) => (stdout += data.toString()));
|
||||
bin.addListener('stderr', (data) => (stderr += data.toString()));
|
||||
bin.run();
|
||||
bin.on('cmdEnd', (cmd) => resolve({ cmd, stdout, stderr }));
|
||||
bin.on('stdout', (data) => (stdout += data.toString()));
|
||||
bin.on('stderr', (data) => (stderr += data.toString()));
|
||||
});
|
||||
}
|
||||
|
||||
@ -25,16 +24,14 @@ function assertExecError(cmd, desc) {
|
||||
desc = desc || 'Run ' + cmd;
|
||||
return new Promise((resolve, reject) => {
|
||||
let stderr = '';
|
||||
// console.log(`Executing: ${cmd}`);
|
||||
const bin = jake.createExec([cmd]);
|
||||
bin.addListener('error', (msg, code) => {
|
||||
const bin = child_process.exec(cmd);
|
||||
bin.on('error', (msg, code) => {
|
||||
resolve(stderr);
|
||||
});
|
||||
bin.addListener('cmdEnd', () => {
|
||||
bin.on('cmdEnd', () => {
|
||||
throw new Error('Error was expected, but none thrown');
|
||||
});
|
||||
bin.addListener('stderr', (data) => (stderr += data.toString()));
|
||||
bin.run();
|
||||
bin.on('stderr', (data) => (stderr += data.toString()));
|
||||
});
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user