azure-pipelines-task-lib 4.17.1 → 4.17.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/task.js +0 -9
- package/toolrunner.js +40 -41
package/package.json
CHANGED
package/task.js
CHANGED
|
@@ -1323,9 +1323,6 @@ exports.rmRF = rmRF;
|
|
|
1323
1323
|
*/
|
|
1324
1324
|
function execAsync(tool, args, options) {
|
|
1325
1325
|
var tr = this.tool(tool);
|
|
1326
|
-
tr.on('debug', function (data) {
|
|
1327
|
-
(0, exports.debug)(data);
|
|
1328
|
-
});
|
|
1329
1326
|
if (args) {
|
|
1330
1327
|
if (args instanceof Array) {
|
|
1331
1328
|
tr.arg(args);
|
|
@@ -1350,9 +1347,6 @@ exports.execAsync = execAsync;
|
|
|
1350
1347
|
*/
|
|
1351
1348
|
function exec(tool, args, options) {
|
|
1352
1349
|
var tr = this.tool(tool);
|
|
1353
|
-
tr.on('debug', function (data) {
|
|
1354
|
-
(0, exports.debug)(data);
|
|
1355
|
-
});
|
|
1356
1350
|
if (args) {
|
|
1357
1351
|
if (args instanceof Array) {
|
|
1358
1352
|
tr.arg(args);
|
|
@@ -1377,9 +1371,6 @@ exports.exec = exec;
|
|
|
1377
1371
|
*/
|
|
1378
1372
|
function execSync(tool, args, options) {
|
|
1379
1373
|
var tr = this.tool(tool);
|
|
1380
|
-
tr.on('debug', function (data) {
|
|
1381
|
-
(0, exports.debug)(data);
|
|
1382
|
-
});
|
|
1383
1374
|
if (args) {
|
|
1384
1375
|
if (args instanceof Array) {
|
|
1385
1376
|
tr.arg(args);
|
package/toolrunner.js
CHANGED
|
@@ -136,23 +136,23 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
136
136
|
}
|
|
137
137
|
return cmd;
|
|
138
138
|
};
|
|
139
|
-
ToolRunner.prototype._processLineBuffer = function (data,
|
|
139
|
+
ToolRunner.prototype._processLineBuffer = function (data, buffer, onLine) {
|
|
140
|
+
var newBuffer = buffer + data.toString();
|
|
140
141
|
try {
|
|
141
|
-
var
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
var line = s.substring(0, n);
|
|
142
|
+
var eolIndex = newBuffer.indexOf(os.EOL);
|
|
143
|
+
while (eolIndex > -1) {
|
|
144
|
+
var line = newBuffer.substring(0, eolIndex);
|
|
145
145
|
onLine(line);
|
|
146
146
|
// the rest of the string ...
|
|
147
|
-
|
|
148
|
-
|
|
147
|
+
newBuffer = newBuffer.substring(eolIndex + os.EOL.length);
|
|
148
|
+
eolIndex = newBuffer.indexOf(os.EOL);
|
|
149
149
|
}
|
|
150
|
-
strBuffer = s;
|
|
151
150
|
}
|
|
152
151
|
catch (err) {
|
|
153
152
|
// streaming lines to console is best effort. Don't fail a build.
|
|
154
153
|
this._debug('error processing line');
|
|
155
154
|
}
|
|
155
|
+
return newBuffer;
|
|
156
156
|
};
|
|
157
157
|
/**
|
|
158
158
|
* Wraps an arg string with specified char if it's not already wrapped
|
|
@@ -638,17 +638,17 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
638
638
|
}
|
|
639
639
|
}
|
|
640
640
|
});
|
|
641
|
-
var
|
|
641
|
+
var stdLineBuffer = '';
|
|
642
642
|
(_c = cp.stdout) === null || _c === void 0 ? void 0 : _c.on('data', function (data) {
|
|
643
643
|
_this.emit('stdout', data);
|
|
644
644
|
if (!optionsNonNull.silent) {
|
|
645
645
|
optionsNonNull.outStream.write(data);
|
|
646
646
|
}
|
|
647
|
-
_this._processLineBuffer(data,
|
|
647
|
+
stdLineBuffer = _this._processLineBuffer(data, stdLineBuffer, function (line) {
|
|
648
648
|
_this.emit('stdline', line);
|
|
649
649
|
});
|
|
650
650
|
});
|
|
651
|
-
var
|
|
651
|
+
var errLineBuffer = '';
|
|
652
652
|
(_d = cp.stderr) === null || _d === void 0 ? void 0 : _d.on('data', function (data) {
|
|
653
653
|
_this.emit('stderr', data);
|
|
654
654
|
success = !optionsNonNull.failOnStdErr;
|
|
@@ -656,7 +656,7 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
656
656
|
var s = optionsNonNull.failOnStdErr ? optionsNonNull.errStream : optionsNonNull.outStream;
|
|
657
657
|
s.write(data);
|
|
658
658
|
}
|
|
659
|
-
_this._processLineBuffer(data,
|
|
659
|
+
errLineBuffer = _this._processLineBuffer(data, errLineBuffer, function (line) {
|
|
660
660
|
_this.emit('errline', line);
|
|
661
661
|
});
|
|
662
662
|
});
|
|
@@ -671,11 +671,11 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
671
671
|
waitingEvents--; //process is complete
|
|
672
672
|
_this._debug('rc:' + code);
|
|
673
673
|
returnCode = code;
|
|
674
|
-
if (
|
|
675
|
-
_this.emit('stdline',
|
|
674
|
+
if (stdLineBuffer.length > 0) {
|
|
675
|
+
_this.emit('stdline', stdLineBuffer);
|
|
676
676
|
}
|
|
677
|
-
if (
|
|
678
|
-
_this.emit('errline',
|
|
677
|
+
if (errLineBuffer.length > 0) {
|
|
678
|
+
_this.emit('errline', errLineBuffer);
|
|
679
679
|
}
|
|
680
680
|
if (code != 0 && !optionsNonNull.ignoreReturnCode) {
|
|
681
681
|
success = false;
|
|
@@ -816,17 +816,17 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
816
816
|
}
|
|
817
817
|
}
|
|
818
818
|
});
|
|
819
|
-
var
|
|
819
|
+
var stdLineBuffer = '';
|
|
820
820
|
(_c = cp.stdout) === null || _c === void 0 ? void 0 : _c.on('data', function (data) {
|
|
821
821
|
_this.emit('stdout', data);
|
|
822
822
|
if (!optionsNonNull.silent) {
|
|
823
823
|
optionsNonNull.outStream.write(data);
|
|
824
824
|
}
|
|
825
|
-
_this._processLineBuffer(data,
|
|
825
|
+
stdLineBuffer = _this._processLineBuffer(data, stdLineBuffer, function (line) {
|
|
826
826
|
_this.emit('stdline', line);
|
|
827
827
|
});
|
|
828
828
|
});
|
|
829
|
-
var
|
|
829
|
+
var errLineBuffer = '';
|
|
830
830
|
(_d = cp.stderr) === null || _d === void 0 ? void 0 : _d.on('data', function (data) {
|
|
831
831
|
_this.emit('stderr', data);
|
|
832
832
|
success = !optionsNonNull.failOnStdErr;
|
|
@@ -834,7 +834,7 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
834
834
|
var s = optionsNonNull.failOnStdErr ? optionsNonNull.errStream : optionsNonNull.outStream;
|
|
835
835
|
s.write(data);
|
|
836
836
|
}
|
|
837
|
-
_this._processLineBuffer(data,
|
|
837
|
+
errLineBuffer = _this._processLineBuffer(data, errLineBuffer, function (line) {
|
|
838
838
|
_this.emit('errline', line);
|
|
839
839
|
});
|
|
840
840
|
});
|
|
@@ -849,11 +849,11 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
849
849
|
waitingEvents--; //process is complete
|
|
850
850
|
_this._debug('rc:' + code);
|
|
851
851
|
returnCode = code;
|
|
852
|
-
if (
|
|
853
|
-
_this.emit('stdline',
|
|
852
|
+
if (stdLineBuffer.length > 0) {
|
|
853
|
+
_this.emit('stdline', stdLineBuffer);
|
|
854
854
|
}
|
|
855
|
-
if (
|
|
856
|
-
_this.emit('errline',
|
|
855
|
+
if (errLineBuffer.length > 0) {
|
|
856
|
+
_this.emit('errline', errLineBuffer);
|
|
857
857
|
}
|
|
858
858
|
if (code != 0 && !optionsNonNull.ignoreReturnCode) {
|
|
859
859
|
success = false;
|
|
@@ -968,16 +968,15 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
968
968
|
state.on('debug', function (message) {
|
|
969
969
|
_this._debug(message);
|
|
970
970
|
});
|
|
971
|
-
var
|
|
972
|
-
var
|
|
971
|
+
var stdLineBuffer = '';
|
|
972
|
+
var errLineBuffer = '';
|
|
973
973
|
var emitDoneEvent = function (resolve, reject) {
|
|
974
|
-
var _this = this;
|
|
975
974
|
state.on('done', function (error, exitCode) {
|
|
976
|
-
if (
|
|
977
|
-
_this.emit('stdline',
|
|
975
|
+
if (stdLineBuffer.length > 0) {
|
|
976
|
+
_this.emit('stdline', stdLineBuffer);
|
|
978
977
|
}
|
|
979
|
-
if (
|
|
980
|
-
_this.emit('errline',
|
|
978
|
+
if (errLineBuffer.length > 0) {
|
|
979
|
+
_this.emit('errline', errLineBuffer);
|
|
981
980
|
}
|
|
982
981
|
if (cp) {
|
|
983
982
|
cp.removeAllListeners();
|
|
@@ -1018,7 +1017,7 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
1018
1017
|
if (!optionsNonNull.silent) {
|
|
1019
1018
|
optionsNonNull.outStream.write(data);
|
|
1020
1019
|
}
|
|
1021
|
-
_this._processLineBuffer(data,
|
|
1020
|
+
stdLineBuffer = _this._processLineBuffer(data, stdLineBuffer, function (line) {
|
|
1022
1021
|
_this.emit('stdline', line);
|
|
1023
1022
|
});
|
|
1024
1023
|
});
|
|
@@ -1029,7 +1028,7 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
1029
1028
|
var s = optionsNonNull.failOnStdErr ? optionsNonNull.errStream : optionsNonNull.outStream;
|
|
1030
1029
|
s.write(data);
|
|
1031
1030
|
}
|
|
1032
|
-
_this._processLineBuffer(data,
|
|
1031
|
+
errLineBuffer = _this._processLineBuffer(data, errLineBuffer, function (line) {
|
|
1033
1032
|
_this.emit('errline', line);
|
|
1034
1033
|
});
|
|
1035
1034
|
});
|
|
@@ -1085,14 +1084,14 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
1085
1084
|
state.on('debug', function (message) {
|
|
1086
1085
|
_this._debug(message);
|
|
1087
1086
|
});
|
|
1088
|
-
var
|
|
1089
|
-
var
|
|
1087
|
+
var stdLineBuffer = '';
|
|
1088
|
+
var errLineBuffer = '';
|
|
1090
1089
|
state.on('done', function (error, exitCode) {
|
|
1091
|
-
if (
|
|
1092
|
-
_this.emit('stdline',
|
|
1090
|
+
if (stdLineBuffer.length > 0) {
|
|
1091
|
+
_this.emit('stdline', stdLineBuffer);
|
|
1093
1092
|
}
|
|
1094
|
-
if (
|
|
1095
|
-
_this.emit('errline',
|
|
1093
|
+
if (errLineBuffer.length > 0) {
|
|
1094
|
+
_this.emit('errline', errLineBuffer);
|
|
1096
1095
|
}
|
|
1097
1096
|
if (cp) {
|
|
1098
1097
|
cp.removeAllListeners();
|
|
@@ -1130,7 +1129,7 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
1130
1129
|
if (!optionsNonNull.silent) {
|
|
1131
1130
|
optionsNonNull.outStream.write(data);
|
|
1132
1131
|
}
|
|
1133
|
-
_this._processLineBuffer(data,
|
|
1132
|
+
stdLineBuffer = _this._processLineBuffer(data, stdLineBuffer, function (line) {
|
|
1134
1133
|
_this.emit('stdline', line);
|
|
1135
1134
|
});
|
|
1136
1135
|
});
|
|
@@ -1141,7 +1140,7 @@ var ToolRunner = /** @class */ (function (_super) {
|
|
|
1141
1140
|
var s = optionsNonNull.failOnStdErr ? optionsNonNull.errStream : optionsNonNull.outStream;
|
|
1142
1141
|
s.write(data);
|
|
1143
1142
|
}
|
|
1144
|
-
_this._processLineBuffer(data,
|
|
1143
|
+
errLineBuffer = _this._processLineBuffer(data, errLineBuffer, function (line) {
|
|
1145
1144
|
_this.emit('errline', line);
|
|
1146
1145
|
});
|
|
1147
1146
|
});
|